Skip to content

Commit de21ced

Browse files
committed
fix: Minimize logging when waiting for IP address
1 parent 4f29ed6 commit de21ced

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

pkg/drivers/common/common.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,6 @@ 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)
211209
file, err := os.Open(path)
212210
if err != nil {
213211
return "", err

pkg/drivers/krunkit/krunkit.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ const (
6161
serialFileName = "serial.log"
6262
logLevelInfo = "3"
6363
defaultSSHUser = "docker"
64+
maxAttempts = 60
6465
)
6566

6667
// Driver is the machine driver for krunkit.
@@ -286,13 +287,13 @@ func (d *Driver) setupIP(mac string) error {
286287
return nil
287288
}
288289
// Implement a retry loop because IP address isn't added to dhcp leases file immediately
289-
for i := 0; i < 60; i++ {
290-
log.Debugf("Attempt %d", i)
290+
for i := 0; i < maxAttempts; i++ {
291291
err = getIP()
292292
if err == nil {
293293
break
294294
}
295295
time.Sleep(2 * time.Second)
296+
log.Debugf("Searching for %s in %s (attempt %d/%d)", d.MACAddress, common.LeasesPath, i+1, maxAttempts)
296297
}
297298

298299
if err == nil {

pkg/drivers/qemu/qemu.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ const (
5656
isoFilename = "boot2docker.iso"
5757
serialFileName = "serial.log"
5858
privateNetworkName = "docker-machines"
59-
60-
defaultSSHUser = "docker"
59+
defaultSSHUser = "docker"
60+
maxAttempts = 60
6161
)
6262

6363
type Driver struct {
@@ -521,13 +521,13 @@ 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-
for i := 0; i < 60*multiplier; i++ {
525-
log.Debugf("Attempt %d", i)
524+
for i := 0; i < maxAttempts*multiplier; i++ {
526525
err = getIP()
527526
if err == nil {
528527
break
529528
}
530529
time.Sleep(2 * time.Second)
530+
log.Debugf("Searching for %s in %s (attempt %d/%d)", d.MACAddress, common.LeasesPath, i+1, maxAttempts*multiplier)
531531
}
532532

533533
if err == nil {

pkg/drivers/vfkit/vfkit.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ const (
6262
logFileName = "vfkit.log"
6363
serialFileName = "serial.log"
6464
defaultSSHUser = "docker"
65+
maxAttempts = 60
6566
)
6667

6768
// Driver is the machine driver for vfkit (Virtualization.framework)
@@ -361,13 +362,13 @@ func (d *Driver) setupIP(mac string) error {
361362
if detect.NestedVM() {
362363
multiplier = 3 // will help with running in Free github action Macos VMs (takes 160+ retries on average)
363364
}
364-
for i := 0; i < 60*multiplier; i++ {
365-
log.Debugf("Attempt %d", i)
365+
for i := 0; i < maxAttempts*multiplier; i++ {
366366
err = getIP()
367367
if err == nil {
368368
break
369369
}
370370
time.Sleep(2 * time.Second)
371+
log.Debugf("Searching for %s in %s (attempt %d/%d)", d.MACAddress, common.LeasesPath, i+1, maxAttempts*multiplier)
371372
}
372373

373374
if err == nil {

0 commit comments

Comments
 (0)