GitList

Browse code

Fix deadlock on plugin shutdown.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>

Anusha Ragunathan authored on 2016/08/12 07:59:35
Showing 2 changed files

integration-cli/docker_cli_daemon_experimental_test.go index d57e93a..5fe96ba 100644
plugin/manager_linux.go index 06db3d4..8542ece 100644

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)

plugin/manager_linux.go

History View file @ 4d00908

@@ -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)

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