mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

close connections more reliably

Browse Source
This commit is contained in:
iwilltry42 2021-10-25 12:17:22 +02:00
parent 407ced6405
commit c99011b091
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/client/node.go
View File

@ -685,13 +685,12 @@ func NodeWaitForLogMessage(ctx context.Context, runtime runtimes.Runtime, node *
// read the logs // read the logs
out, err := runtime.GetNodeLogs(ctx, node, since) out, err := runtime.GetNodeLogs(ctx, node, since)
if out != nil {
defer out.Close()
}
if err != nil { if err != nil {
if out != nil {
out.Close()
}
return fmt.Errorf("Failed waiting for log message '%s' from node '%s': %w", message, node.Name, err) return fmt.Errorf("Failed waiting for log message '%s' from node '%s': %w", message, node.Name, err)
} }
defer out.Close()
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
nRead, _ := buf.ReadFrom(out) nRead, _ := buf.ReadFrom(out)

6
pkg/runtimes/docker/node.go
View File

@ -309,6 +309,9 @@ func (d Docker) GetNodeLogs(ctx context.Context, node *k3d.Node, since time.Time
// ExecInNodeGetLogs executes a command inside a node and returns the logs to the caller, e.g. to parse them // ExecInNodeGetLogs executes a command inside a node and returns the logs to the caller, e.g. to parse them
func (d Docker) ExecInNodeGetLogs(ctx context.Context, node *k3d.Node, cmd []string) (*bufio.Reader, error) { func (d Docker) ExecInNodeGetLogs(ctx context.Context, node *k3d.Node, cmd []string) (*bufio.Reader, error) {
resp, err := executeInNode(ctx, node, cmd) resp, err := executeInNode(ctx, node, cmd)
if resp != nil {
defer resp.Close()
}
if err != nil { if err != nil {
if resp != nil && resp.Reader != nil { // sometimes the exec process returns with a non-zero exit code, but we still have the logs we if resp != nil && resp.Reader != nil { // sometimes the exec process returns with a non-zero exit code, but we still have the logs we
return resp.Reader, err return resp.Reader, err
@ -321,6 +324,9 @@ func (d Docker) ExecInNodeGetLogs(ctx context.Context, node *k3d.Node, cmd []str
// ExecInNode execs a command inside a node // ExecInNode execs a command inside a node
func (d Docker) ExecInNode(ctx context.Context, node *k3d.Node, cmd []string) error { func (d Docker) ExecInNode(ctx context.Context, node *k3d.Node, cmd []string) error {
execConnection, err := executeInNode(ctx, node, cmd) execConnection, err := executeInNode(ctx, node, cmd)
if execConnection != nil {
defer execConnection.Close()
}
if err != nil { if err != nil {
if execConnection != nil && execConnection.Reader != nil { if execConnection != nil && execConnection.Reader != nil {
logs, err := ioutil.ReadAll(execConnection.Reader) logs, err := ioutil.ReadAll(execConnection.Reader)

1
pkg/runtimes/docker/util.go
View File

@ -149,6 +149,7 @@ func (d Docker) ReadFromNode(ctx context.Context, path string, node *k3d.Node) (
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get docker client: %w", err) return nil, fmt.Errorf("failed to get docker client: %w", err)
} }
defer docker.Close()
reader, _, err := docker.CopyFromContainer(ctx, nodeContainer.ID, path) reader, _, err := docker.CopyFromContainer(ctx, nodeContainer.ID, path)
if err != nil { if err != nil {