docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00
Code Activity

Merge pull request #25642 from anusha-ragunathan/plugin-shutdown-lock

Browse Source 
Fix deadlock on plugin shutdown.
Upstream-commit: 57cf20c2ca4359b58baa0b008fda1e18890bb56d
Component: engine
This commit is contained in:
Tibor Vass
2016-08-11 21:07:34 -07:00
committed by GitHub
parent 760a099e44 cdfc3ebd94
commit 1b23be6e0a
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/integration-cli/docker_cli_daemon_experimental_test.go
View File

@@ -46,7 +46,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginEnabled(c *check.C) {
c.Assert(out, checker.Contains, "true")
}
// TestDaemonRestartWithPluginEnabled tests state restore for a disabled plugin
// TestDaemonRestartWithPluginDisabled tests state restore for a disabled plugin
func (s *DockerDaemonSuite) TestDaemonRestartWithPluginDisabled(c *check.C) {
if err := s.d.Start(); err != nil {
c.Fatalf("Could not start daemon: %v", err)

4
components/engine/plugin/manager_linux.go
View File

@@ -174,10 +174,6 @@ func (pm *Manager) Shutdown() {
}
}
close(p.exitChan)
pm.Lock()
p.PluginObj.Active = false
pm.save()
pm.Unlock()
}
if err := os.RemoveAll(p.runtimeSourcePath); err != nil {
logrus.Errorf("Remove plugin runtime failed with error: %v", err)