Skip to content

K
k3s
Commit b9cc5487 authored by Yu-Ju Hong's avatar Yu-Ju Hong
Browse files
Options

Merge pull request #10763 from bprashanth/timer_leak

Don't leak tickers during an exec probe
parents 97baadab 33e2f7cb
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
pkg/kubelet/dockertools/exec.go
View file @ b9cc5487
...@@ -123,7 +123,8 @@ func (*NativeExecHandler) ExecInContainer(client DockerInterface, container *doc ...@@ -123,7 +123,8 @@ func (*NativeExecHandler) ExecInContainer(client DockerInterface, container *doc
if err != nil { if err != nil {
return err return err
} }
tick := time.Tick(2 * time.Second) ticker := time.NewTicker(2 * time.Second)
defer ticker.Stop()
count := 0 count := 0
for { for {
inspect, err2 := client.InspectExec(execObj.ID) inspect, err2 := client.InspectExec(execObj.ID)
...@@ -143,7 +144,7 @@ func (*NativeExecHandler) ExecInContainer(client DockerInterface, container *doc ...@@ -143,7 +144,7 @@ func (*NativeExecHandler) ExecInContainer(client DockerInterface, container *doc
break break
} }
<-tick <-ticker.C
} }
return err return err
......
pkg/kubelet/dockertools/manager.go
View file @ b9cc5487
...@@ -945,7 +945,8 @@ func (dm *DockerManager) RunInContainer(containerID string, cmd []string) ([]byt ...@@ -945,7 +945,8 @@ func (dm *DockerManager) RunInContainer(containerID string, cmd []string) ([]byt
glog.V(2).Infof("StartExec With error: %v", err) glog.V(2).Infof("StartExec With error: %v", err)
return nil, err return nil, err
} }
tick := time.Tick(2 * time.Second) ticker := time.NewTicker(2 * time.Second)
defer ticker.Stop()
for { for {
inspect, err2 := dm.client.InspectExec(execObj.ID) inspect, err2 := dm.client.InspectExec(execObj.ID)
if err2 != nil { if err2 != nil {
...@@ -959,7 +960,7 @@ func (dm *DockerManager) RunInContainer(containerID string, cmd []string) ([]byt ...@@ -959,7 +960,7 @@ func (dm *DockerManager) RunInContainer(containerID string, cmd []string) ([]byt
} }
break break
} }
<-tick <-ticker.C
} }
return buf.Bytes(), err return buf.Bytes(), err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment