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

…lock Fix deadlock on plugin shutdown.
jnorthcote · Aug 12, 2016 · 57cf20c · 57cf20c
2 parents a9a6d4e + 4d00908
commit 57cf20c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/integration-cli/docker_cli_daemon_experimental_test.go b/integration-cli/docker_cli_daemon_experimental_test.go
@@ -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)

diff --git a/plugin/manager_linux.go b/plugin/manager_linux.go
@@ -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)