Skip to content

Commit 22a103a

Browse files
committed
fix: Minimize logging when waiting for ip address
1 parent 4f29ed6 commit 22a103a

File tree

4 files changed

+24
-5
lines changed

4 files changed

+24
-5
lines changed

pkg/drivers/common/common.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,9 @@ func getIPAddressFromFile(mac, path string) (string, error) {
206206
if err != nil {
207207
return "", err
208208
}
209-
210-
log.Debugf("Searching for %s in %s ...", mac, path)
209+
if klog.V(4).Enabled() {
210+
log.Debugf("Searching for %s in %s ...", mac, path)
211+
}
211212
file, err := os.Open(path)
212213
if err != nil {
213214
return "", err

pkg/drivers/krunkit/krunkit.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,14 +286,20 @@ func (d *Driver) setupIP(mac string) error {
286286
return nil
287287
}
288288
// Implement a retry loop because IP address isn't added to dhcp leases file immediately
289+
attempts := 0
289290
for i := 0; i < 60; i++ {
290-
log.Debugf("Attempt %d", i)
291+
attempts = i
292+
if klog.V(4).Enabled() {
293+
log.Debugf("Attempt %d", i)
294+
}
291295
err = getIP()
292296
if err == nil {
293297
break
294298
}
295299
time.Sleep(2 * time.Second)
296300
}
301+
path := "/var/db/dhcpd_leases"
302+
log.Debugf("Searching for %s in %s (attempt %d/60)", d.MACAddress, path, attempts+1)
297303

298304
if err == nil {
299305
log.Debugf("IP: %s", d.IPAddress)

pkg/drivers/qemu/qemu.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,14 +521,20 @@ func (d *Driver) Start() error {
521521
if detect.NestedVM() {
522522
multiplier = 3 // will help with running in Free github action Macos VMs (takes 112+ retries on average)
523523
}
524+
attempts := 0
524525
for i := 0; i < 60*multiplier; i++ {
525-
log.Debugf("Attempt %d", i)
526+
attempts = i
527+
if klog.V(4).Enabled() {
528+
log.Debugf("Attempt %d", i)
529+
}
526530
err = getIP()
527531
if err == nil {
528532
break
529533
}
530534
time.Sleep(2 * time.Second)
531535
}
536+
path := "/var/db/dhcpd_leases"
537+
log.Debugf("Searching for %s in %s (attempt %d/%d)", d.MACAddress, path, attempts+1, 60*multiplier)
532538

533539
if err == nil {
534540
log.Debugf("IP: %s", d.IPAddress)

pkg/drivers/vfkit/vfkit.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,14 +361,20 @@ func (d *Driver) setupIP(mac string) error {
361361
if detect.NestedVM() {
362362
multiplier = 3 // will help with running in Free github action Macos VMs (takes 160+ retries on average)
363363
}
364+
attempts := 0
364365
for i := 0; i < 60*multiplier; i++ {
365-
log.Debugf("Attempt %d", i)
366+
attempts = i
367+
if klog.V(4).Enabled() {
368+
log.Debugf("Attempt %d", i)
369+
}
366370
err = getIP()
367371
if err == nil {
368372
break
369373
}
370374
time.Sleep(2 * time.Second)
371375
}
376+
path := "/var/db/dhcpd_leases"
377+
log.Debugf("Searching for %s in %s (attempt %d/%d)", d.MACAddress, path, attempts+1, 60*multiplier)
372378

373379
if err == nil {
374380
log.Debugf("IP: %s", d.IPAddress)

0 commit comments

Comments
 (0)