-
Notifications
You must be signed in to change notification settings - Fork 5.2k
drivers: Introduce WaitForSSHAccess and fix macos smoke tests #22179
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+171
−89
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
eb0f4d8
drivers: Improve waiting for SSH server
nirs d688bf0
common: Eliminate duration argument
nirs d6028e9
common: Limit waiting for SSH server
nirs c0da849
ci: Make smoke tests easier to debug
nirs b538173
ci: Improve jobs names
nirs 0d51fcf
ci: Disable spotlight indexing
nirs fa0e7fe
ci: Tune cpus and memory for macOS runners
nirs 505b1c9
ci: Run minikube as root on macOS runners
nirs File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| /* | ||
| Copyright 2016 The Kubernetes Authors All rights reserved. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package common | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "io" | ||
| "net" | ||
| "os" | ||
| "strconv" | ||
| "time" | ||
|
|
||
| "github.com/docker/machine/libmachine/drivers" | ||
| "github.com/docker/machine/libmachine/log" | ||
| ) | ||
|
|
||
| var ( | ||
| retryDelay = time.Second | ||
|
|
||
| // We have 2 cases: | ||
| // - First start: called after a DHCP lease was created. The host is up and | ||
| // has an IP address. The SSH server is accessible in 10-1000 | ||
| // milliseconds locally, and few seconds in the GitHub macOS runners. | ||
| // - Second start: The DHCP lease is found immediately in DHCP leases | ||
| // database but the host is not up yet. SSH is accessible in few seconds | ||
| // locally, and 2-3 minutes in GitHub macOS runners. | ||
| timeout = 5 * time.Minute | ||
| ) | ||
|
|
||
| // WaitForSSHAccess waits until remote SSH server is responding. Returns an | ||
| // error if the wait timed out or could not be started. | ||
| func WaitForSSHAccess(d drivers.Driver) error { | ||
| ip, err := d.GetIP() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| port, err := d.GetSSHPort() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| addr := net.JoinHostPort(ip, strconv.Itoa(port)) | ||
| log.Infof("Waiting until SSH server %q is accessible", addr) | ||
|
|
||
| start := time.Now() | ||
| deadline := start.Add(timeout) | ||
| dialer := net.Dialer{Deadline: deadline} | ||
|
|
||
| for { | ||
nirs marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| done, err := checkSSHAccess(&dialer, addr) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if done { | ||
| log.Infof("SSH server %q is accessible in %.3f seconds", addr, time.Since(start).Seconds()) | ||
| return nil | ||
| } | ||
| time.Sleep(retryDelay) | ||
| } | ||
| } | ||
|
|
||
| // checkSSHAccess performs one check, returning: | ||
| // - (true, nil) we accessed the SSH server | ||
| // - (false, nil) failed to access the server, need to retry again | ||
| // - (false , error) timeout accessing the server, do not retry | ||
| func checkSSHAccess(dialer *net.Dialer, addr string) (bool, error) { | ||
| if time.Now().After(dialer.Deadline) { | ||
| return false, fmt.Errorf("timeout waiting for SSH server %q", addr) | ||
| } | ||
|
|
||
| log.Debugf("Dialing to SSH server %q", addr) | ||
| conn, err := dialer.Dial("tcp", addr) | ||
| if err != nil { | ||
| if errors.Is(err, os.ErrDeadlineExceeded) { | ||
| return false, fmt.Errorf("timeout dialing to SSH server %q", addr) | ||
| } | ||
| log.Debugf("Failed to dial: %v", err) | ||
| return false, nil | ||
| } | ||
|
|
||
| defer conn.Close() | ||
|
|
||
| if err := conn.SetReadDeadline(dialer.Deadline); err != nil { | ||
| log.Debugf("Failed to set timeout: %v", err) | ||
| return false, nil | ||
| } | ||
|
|
||
| log.Debugf("Reading from SSH server %q", addr) | ||
| if _, err := conn.Read(make([]byte, 1)); err != nil && err != io.EOF { | ||
| if errors.Is(err, os.ErrDeadlineExceeded) { | ||
| return false, fmt.Errorf("timeout reading from SSH server %q", addr) | ||
| } | ||
| log.Debugf("Failed to read: %v", err) | ||
| return false, nil | ||
| } | ||
|
|
||
| return true, nil | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.