mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
8c56588d04
A plugin has an `ExitChan` channel which is used to signal the exit of
the plugin process. In a recent change, the initialization was
incorrectly moved to the daemon Shutdown path.
Fix this by initializing the channel during plugin enable.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit 890a98ceed)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
101 lines
2.5 KiB
Go
101 lines
2.5 KiB
Go
// +build linux
|
|
|
|
package plugin
|
|
|
|
import (
|
|
"fmt"
|
|
"path/filepath"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/Sirupsen/logrus"
|
|
"github.com/docker/docker/libcontainerd"
|
|
"github.com/docker/docker/oci"
|
|
"github.com/docker/docker/pkg/plugins"
|
|
"github.com/docker/docker/plugin/v2"
|
|
specs "github.com/opencontainers/runtime-spec/specs-go"
|
|
)
|
|
|
|
func (pm *Manager) enable(p *v2.Plugin, force bool) error {
|
|
if p.IsEnabled() && !force {
|
|
return fmt.Errorf("plugin %s is already enabled", p.Name())
|
|
}
|
|
spec, err := p.InitSpec(oci.DefaultSpec(), pm.libRoot)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
p.Lock()
|
|
p.Restart = true
|
|
p.ExitChan = make(chan bool)
|
|
p.Unlock()
|
|
if err := pm.containerdClient.Create(p.GetID(), "", "", specs.Spec(*spec), attachToLog(p.GetID())); err != nil {
|
|
return err
|
|
}
|
|
|
|
p.PClient, err = plugins.NewClientWithTimeout("unix://"+filepath.Join(p.RuntimeSourcePath, p.GetSocket()), nil, p.TimeoutInSecs)
|
|
if err != nil {
|
|
p.Lock()
|
|
p.Restart = false
|
|
p.Unlock()
|
|
shutdownPlugin(p, pm.containerdClient)
|
|
return err
|
|
}
|
|
|
|
pm.pluginStore.SetState(p, true)
|
|
pm.pluginStore.CallHandler(p)
|
|
|
|
return nil
|
|
}
|
|
|
|
func (pm *Manager) restore(p *v2.Plugin) error {
|
|
return pm.containerdClient.Restore(p.GetID(), attachToLog(p.GetID()))
|
|
}
|
|
|
|
func shutdownPlugin(p *v2.Plugin, containerdClient libcontainerd.Client) {
|
|
pluginID := p.GetID()
|
|
|
|
err := containerdClient.Signal(pluginID, int(syscall.SIGTERM))
|
|
if err != nil {
|
|
logrus.Errorf("Sending SIGTERM to plugin failed with error: %v", err)
|
|
} else {
|
|
select {
|
|
case <-p.ExitChan:
|
|
logrus.Debug("Clean shutdown of plugin")
|
|
case <-time.After(time.Second * 10):
|
|
logrus.Debug("Force shutdown plugin")
|
|
if err := containerdClient.Signal(pluginID, int(syscall.SIGKILL)); err != nil {
|
|
logrus.Errorf("Sending SIGKILL to plugin failed with error: %v", err)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func (pm *Manager) disable(p *v2.Plugin) error {
|
|
if !p.IsEnabled() {
|
|
return fmt.Errorf("plugin %s is already disabled", p.Name())
|
|
}
|
|
p.Lock()
|
|
p.Restart = false
|
|
p.Unlock()
|
|
|
|
shutdownPlugin(p, pm.containerdClient)
|
|
pm.pluginStore.SetState(p, false)
|
|
return nil
|
|
}
|
|
|
|
// Shutdown stops all plugins and called during daemon shutdown.
|
|
func (pm *Manager) Shutdown() {
|
|
plugins := pm.pluginStore.GetAll()
|
|
for _, p := range plugins {
|
|
if pm.liveRestore && p.IsEnabled() {
|
|
logrus.Debug("Plugin active when liveRestore is set, skipping shutdown")
|
|
continue
|
|
}
|
|
if pm.containerdClient != nil && p.IsEnabled() {
|
|
p.Lock()
|
|
p.Restart = false
|
|
p.Unlock()
|
|
shutdownPlugin(p, pm.containerdClient)
|
|
}
|
|
}
|
|
}
|