When handling plugin exit, lookup plugins only during daemon shutdown.

anusha-ragunathan · anusha-ragunathan · commit 57499fa62e69 · 2016-08-15T14:46:02.000-07:00
The main intent of handling plugin exit is for graceful shutdown
of plugins during daemon shutdown. So avoid plugin lookup during
plugin exits caused by other reasons (eg. force remove)

Signed-off-by: Anusha Ragunathan &lt;anusha@docker.com&gt;
diff --git a/plugin/manager.go b/plugin/manager.go
@@ -253,20 +253,24 @@ func LookupWithCapability(name, capability string) (Plugin, error) {
 	return nil, ErrInadequateCapability{name, capability}
 }
 
-// StateChanged updates plugin internals using from libcontainerd events.
+// StateChanged updates plugin internals using libcontainerd events.
 func (pm *Manager) StateChanged(id string, e libcontainerd.StateInfo) error {
 	logrus.Debugf("plugin state changed %s %#v", id, e)
 
 	switch e.State {
 	case libcontainerd.StateExit:
+		var shutdown bool
 		pm.RLock()
-		p, idOk := pm.plugins[id]
+		shutdown = pm.shutdown
 		pm.RUnlock()
-		if !idOk {
-			return ErrNotFound(id)
-		}
-		if pm.shutdown == true {
-			p.exitChan <- true
+		if shutdown {
+			pm.RLock()
+			p, idOk := pm.plugins[id]
+			pm.RUnlock()
+			if !idOk {
+				return ErrNotFound(id)
+			}
+			close(p.exitChan)
 		}
 	}
 
diff --git a/plugin/manager_linux.go b/plugin/manager_linux.go
@@ -143,10 +143,12 @@ func (pm *Manager) disable(p *plugin) error {
 
 // Shutdown stops all plugins and called during daemon shutdown.
 func (pm *Manager) Shutdown() {
+	pm.Lock()
+	pm.shutdown = true
+	pm.Unlock()
+
 	pm.RLock()
 	defer pm.RUnlock()
-
-	pm.shutdown = true
 	for _, p := range pm.plugins {
 		if pm.liveRestore && p.PluginObj.Active {
 			logrus.Debug("Plugin active when liveRestore is set, skipping shutdown")
@@ -173,7 +175,6 @@ func (pm *Manager) Shutdown() {
 					}
 				}
 			}
-			close(p.exitChan)
 		}
 		if err := os.RemoveAll(p.runtimeSourcePath); err != nil {
 			logrus.Errorf("Remove plugin runtime failed with error: %v", err)

Original file line number	Diff line number	Diff line change
`@@ -143,10 +143,12 @@ func (pm Manager) disable(p plugin) error {`
`143`	`143`
`144`	`144`	`// Shutdown stops all plugins and called during daemon shutdown.`
`145`	`145`	`func (pm *Manager) Shutdown() {`
	`146`	`+ pm.Lock()`
	`147`	`+ pm.shutdown = true`
	`148`	`+ pm.Unlock()`
	`149`	`+`
`146`	`150`	`pm.RLock()`
`147`	`151`	`defer pm.RUnlock()`
`148`		`-`
`149`		`- pm.shutdown = true`
`150`	`152`	`for _, p := range pm.plugins {`
`151`	`153`	`if pm.liveRestore && p.PluginObj.Active {`
`152`	`154`	`logrus.Debug("Plugin active when liveRestore is set, skipping shutdown")`
`@@ -173,7 +175,6 @@ func (pm *Manager) Shutdown() {`
`173`	`175`	`}`
`174`	`176`	`}`
`175`	`177`	`}`
`176`		`- close(p.exitChan)`
`177`	`178`	`}`
`178`	`179`	`if err := os.RemoveAll(p.runtimeSourcePath); err != nil {`
`179`	`180`	`logrus.Errorf("Remove plugin runtime failed with error: %v", err)`