From 3f6e6b3f2dc621f95db458df53e9396a01fd26db Mon Sep 17 00:00:00 2001 From: Anusha Ragunathan Date: Wed, 16 Nov 2016 14:42:46 -0800 Subject: [PATCH] Cleanup after plugin install. During error cases, we dont cleanup correctly. This commit takes care of removing the plugin, if there are errors after the pull passed. It also shuts down the plugin, if there are errors after the plugin in the enable path. Signed-off-by: Anusha Ragunathan (cherry picked from commit 1144f8f1d4b1fd2bbf1f41bf5dad8d929d0dc06e) Signed-off-by: Victor Vieux --- client/plugin_install.go | 12 +++++++++--- plugin/manager_linux.go | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/client/plugin_install.go b/client/plugin_install.go index d0a3d517fc..407f1cddf2 100644 --- a/client/plugin_install.go +++ b/client/plugin_install.go @@ -10,7 +10,7 @@ import ( ) // PluginInstall installs a plugin -func (cli *Client) PluginInstall(ctx context.Context, name string, options types.PluginInstallOptions) error { +func (cli *Client) PluginInstall(ctx context.Context, name string, options types.PluginInstallOptions) (err error) { // FIXME(vdemeester) name is a ref, we might want to parse/validate it here. query := url.Values{} query.Set("name", name) @@ -27,6 +27,14 @@ func (cli *Client) PluginInstall(ctx context.Context, name string, options types ensureReaderClosed(resp) return err } + + defer func() { + if err != nil { + delResp, _ := cli.delete(ctx, "/plugins/"+name, nil, nil) + ensureReaderClosed(delResp) + } + }() + var privileges types.PluginPrivileges if err := json.NewDecoder(resp.body).Decode(&privileges); err != nil { ensureReaderClosed(resp) @@ -40,8 +48,6 @@ func (cli *Client) PluginInstall(ctx context.Context, name string, options types return err } if !accept { - resp, _ := cli.delete(ctx, "/plugins/"+name, nil, nil) - ensureReaderClosed(resp) return pluginPermissionDenied{name} } } diff --git a/plugin/manager_linux.go b/plugin/manager_linux.go index 7a8b05035d..26f0c39f2e 100644 --- a/plugin/manager_linux.go +++ b/plugin/manager_linux.go @@ -36,6 +36,7 @@ func (pm *Manager) enable(p *v2.Plugin, force bool) error { p.Lock() p.Restart = false p.Unlock() + shutdownPlugin(p, pm.containerdClient) return err }