kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #25723 from anusha-ragunathan/plugin-force-rm

Browse source 
When handling plugin exit, lookup plugins only during daemon shutdown.
This commit is contained in:
Tõnis Tiigi 2016-08-15 16:30:37 -07:00 committed by GitHub
commit 70f843f7ae
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugin/manager.go
View file

@ -253,20 +253,24 @@ func LookupWithCapability(name, capability string) (Plugin, error) {
return nil, ErrInadequateCapability{name, capability} 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 { func (pm *Manager) StateChanged(id string, e libcontainerd.StateInfo) error {
logrus.Debugf("plugin state changed %s %#v", id, e) logrus.Debugf("plugin state changed %s %#v", id, e)
switch e.State { switch e.State {
case libcontainerd.StateExit: case libcontainerd.StateExit:
var shutdown bool
pm.RLock()
shutdown = pm.shutdown
pm.RUnlock()
if shutdown {
pm.RLock() pm.RLock()
p, idOk := pm.plugins[id] p, idOk := pm.plugins[id]
pm.RUnlock() pm.RUnlock()
if !idOk { if !idOk {
return ErrNotFound(id) return ErrNotFound(id)
} }
if pm.shutdown == true { close(p.exitChan)
p.exitChan <- true
} }
} }

7
plugin/manager_linux.go
View file

@ -143,10 +143,12 @@ func (pm *Manager) disable(p *plugin) error {
// Shutdown stops all plugins and called during daemon shutdown. // Shutdown stops all plugins and called during daemon shutdown.
func (pm *Manager) Shutdown() { func (pm *Manager) Shutdown() {
pm.Lock()
pm.shutdown = true
pm.Unlock()
pm.RLock() pm.RLock()
defer pm.RUnlock() defer pm.RUnlock()
pm.shutdown = true
for _, p := range pm.plugins { for _, p := range pm.plugins {
if pm.liveRestore && p.PluginObj.Active { if pm.liveRestore && p.PluginObj.Active {
logrus.Debug("Plugin active when liveRestore is set, skipping shutdown") 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 { if err := os.RemoveAll(p.runtimeSourcePath); err != nil {
logrus.Errorf("Remove plugin runtime failed with error: %v", err) logrus.Errorf("Remove plugin runtime failed with error: %v", err)