mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #24593 from mlaventure/fix-libcontainerd-data-race
Fix data race in libcontainerd
This commit is contained in:
commit
0a96ba8a0f
1 changed files with 1 additions and 1 deletions
|
@ -143,8 +143,8 @@ func (r *remote) handleConnectionChange() {
|
||||||
transientFailureCount = 0
|
transientFailureCount = 0
|
||||||
if utils.IsProcessAlive(r.daemonPid) {
|
if utils.IsProcessAlive(r.daemonPid) {
|
||||||
utils.KillProcess(r.daemonPid)
|
utils.KillProcess(r.daemonPid)
|
||||||
<-r.daemonWaitCh
|
|
||||||
}
|
}
|
||||||
|
<-r.daemonWaitCh
|
||||||
if err := r.runContainerdDaemon(); err != nil { //FIXME: Handle error
|
if err := r.runContainerdDaemon(); err != nil { //FIXME: Handle error
|
||||||
logrus.Errorf("error restarting containerd: %v", err)
|
logrus.Errorf("error restarting containerd: %v", err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue