Merge pull request #32095 from anusha-ragunathan/set-state

Explictly set state of a disabled plugin.
moby · Mar 24, 2017 · cddffe3 · cddffe3
2 parents 3c22c7d + bbbf64f
commit cddffe3
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/plugin/manager_linux.go b/plugin/manager_linux.go
@@ -97,6 +97,8 @@ func (pm *Manager) pluginPostStart(p *v2.Plugin, c *controller) error {
 		if retries > maxRetries {
 			logrus.Debugf("error net dialing plugin: %v", err)
 			c.restart = false
+			// While restoring plugins, we need to explicitly set the state to disabled
+			pm.config.Store.SetState(p, false)
 			shutdownPlugin(p, c, pm.containerdClient)
 			return err
 		}