diff --git a/pkg/drivers/common/common.go b/pkg/drivers/common/common.go index 847eb6679e32..474e363ddac7 100644 --- a/pkg/drivers/common/common.go +++ b/pkg/drivers/common/common.go @@ -206,8 +206,6 @@ func getIPAddressFromFile(mac, path string) (string, error) { if err != nil { return "", err } - - log.Debugf("Searching for %s in %s ...", mac, path) file, err := os.Open(path) if err != nil { return "", err diff --git a/pkg/drivers/krunkit/krunkit.go b/pkg/drivers/krunkit/krunkit.go index cbbeadb573cb..afa3409ac318 100644 --- a/pkg/drivers/krunkit/krunkit.go +++ b/pkg/drivers/krunkit/krunkit.go @@ -286,13 +286,14 @@ func (d *Driver) setupIP(mac string) error { return nil } // Implement a retry loop because IP address isn't added to dhcp leases file immediately - for i := 0; i < 60; i++ { - log.Debugf("Attempt %d", i) + const maxAttempts = 60 + for i := 0; i < maxAttempts; i++ { err = getIP() if err == nil { break } time.Sleep(2 * time.Second) + log.Debugf("Searching for %s in %s (attempt %d/%d)", d.MACAddress, common.LeasesPath, i+1, maxAttempts) } if err == nil { diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 763a23158442..e945ae837e9c 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -56,8 +56,7 @@ const ( isoFilename = "boot2docker.iso" serialFileName = "serial.log" privateNetworkName = "docker-machines" - - defaultSSHUser = "docker" + defaultSSHUser = "docker" ) type Driver struct { @@ -521,13 +520,15 @@ func (d *Driver) Start() error { if detect.NestedVM() { multiplier = 3 // will help with running in Free github action Macos VMs (takes 112+ retries on average) } - for i := 0; i < 60*multiplier; i++ { - log.Debugf("Attempt %d", i) + + maxAttempts := 60 * multiplier + for i := 0; i < maxAttempts; i++ { err = getIP() if err == nil { break } time.Sleep(2 * time.Second) + log.Debugf("Searching for %s in %s (attempt %d/%d)", d.MACAddress, common.LeasesPath, i+1, maxAttempts) } if err == nil { diff --git a/pkg/drivers/vfkit/vfkit.go b/pkg/drivers/vfkit/vfkit.go index 88fbd96ad006..d93071db5f0c 100644 --- a/pkg/drivers/vfkit/vfkit.go +++ b/pkg/drivers/vfkit/vfkit.go @@ -361,13 +361,15 @@ func (d *Driver) setupIP(mac string) error { if detect.NestedVM() { multiplier = 3 // will help with running in Free github action Macos VMs (takes 160+ retries on average) } - for i := 0; i < 60*multiplier; i++ { - log.Debugf("Attempt %d", i) + + maxAttempts := 60 * multiplier + for i := 0; i < maxAttempts; i++ { err = getIP() if err == nil { break } time.Sleep(2 * time.Second) + log.Debugf("Searching for %s in %s (attempt %d/%d)", d.MACAddress, common.LeasesPath, i+1, maxAttempts) } if err == nil {