New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[17.06] Make plugin removes more resilient to failure #91

Merged
merged 3 commits into from Jul 12, 2017

Conversation

Projects
None yet
4 participants
@andrewhsu
Collaborator

andrewhsu commented Jul 4, 2017

Backport fixes:

@andrewhsu andrewhsu changed the title from Make plugin removes more resilient to failure to [17.06] Make plugin removes more resilient to failure Jul 4, 2017

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Jul 4, 2017

Member

ugh, actually looks like it needs to be rewritten for 17.06, or another PR cherry-picked;

03:41:11 [init] Building: bundles/17.06.0-ce/binary-daemon/dockerd-17.06.0-ce
03:41:58 [init] # github.com/docker/docker/plugin
03:41:58 [init] plugin/manager.go:194: undefined: system in system.EnsureRemoveAll
03:42:10 [init] $ ssh-agent -k
Member

thaJeztah commented Jul 4, 2017

ugh, actually looks like it needs to be rewritten for 17.06, or another PR cherry-picked;

03:41:11 [init] Building: bundles/17.06.0-ce/binary-daemon/dockerd-17.06.0-ce
03:41:58 [init] # github.com/docker/docker/plugin
03:41:58 [init] plugin/manager.go:194: undefined: system in system.EnsureRemoveAll
03:42:10 [init] $ ssh-agent -k
@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Jul 4, 2017

Member

This depends on moby/moby#31012, which was on the 17.06 milestone, but actually missing in the branch / release

never mind, I seemed to have looked in the wrong "component", looks like it's there, it's just an import missing

Member

thaJeztah commented Jul 4, 2017

This depends on moby/moby#31012, which was on the 17.06 milestone, but actually missing in the branch / release

never mind, I seemed to have looked in the wrong "component", looks like it's there, it's just an import missing

@andrewhsu

This comment has been minimized.

Show comment
Hide comment
@andrewhsu

andrewhsu Jul 4, 2017

Collaborator

Just added one more commit to this PR to get the import system line in. Looks like that import line was added by 8508f49 but don't want to take the entire commit.

Collaborator

andrewhsu commented Jul 4, 2017

Just added one more commit to this PR to get the import system line in. Looks like that import line was added by 8508f49 but don't want to take the entire commit.

@rogaha

This comment has been minimized.

Show comment
Hide comment
@rogaha

rogaha Jul 6, 2017

Contributor

@andrewhsu I think you need to include moby/moby@4bf263c here (see #91 (comment)).

Contributor

rogaha commented Jul 6, 2017

@andrewhsu I think you need to include moby/moby@4bf263c here (see #91 (comment)).

@andrewhsu

This comment has been minimized.

Show comment
Hide comment
@andrewhsu

andrewhsu Jul 6, 2017

Collaborator

i've cherry-picked the git commit from moby/moby#33944

$ git cherry-pick -s -x -Xsubtree=components/engine 4bf263c
Collaborator

andrewhsu commented Jul 6, 2017

i've cherry-picked the git commit from moby/moby#33944

$ git cherry-pick -s -x -Xsubtree=components/engine 4bf263c
@cpuguy83

LGTM

@rogaha

rogaha approved these changes Jul 7, 2017

LGTM

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Jul 8, 2017

Member

ping @andrewhsu ready to go?

Member

thaJeztah commented Jul 8, 2017

ping @andrewhsu ready to go?

@rogaha

This comment has been minimized.

Show comment
Hide comment
@rogaha

rogaha Jul 11, 2017

Contributor

ping @andrewhsu

Contributor

rogaha commented Jul 11, 2017

ping @andrewhsu

cpuguy83 and others added some commits Jun 26, 2017

Make plugin removes more resilient to failure
Before this patch, if the plugin's `config.json` is successfully removed
but the main plugin state dir could not be removed for some reason (e.g.
leaked mount), it will prevent the daemon from being able to be
restarted.

This patches changes this to atomically remove the plugin such that on
daemon restart we can detect that there was an error and re-try. It also
changes the logic so that it only logs errors on restore rather than
erroring out the daemon.

This also removes some code which is now duplicated elsewhere.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 11cf394)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
import system for plugin/manager.go
To get the cherry-pick ba42966 to merge smoothly,
expecting import of system. The import of system was added by
8508f49 but not taking
entire commit.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Fix plugin remove dir name after rename.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 4bf263c)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

@andrewhsu andrewhsu merged commit b2eb133 into docker:17.06 Jul 12, 2017

3 checks passed

ce-tests Jenkins build docker-ce-17.06-pr 162 has succeeded
Details
ce-tests-WoW-RS1 Jenkins build docker-ce-17.06-pr-WoW-RS1 153 has succeeded
Details
dco-signed All commits are signed

@andrewhsu andrewhsu deleted the andrewhsu:fix-plugin branch Jul 12, 2017

@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017

docker-jenkins pushed a commit that referenced this pull request Mar 17, 2018

Merge pull request #91 from seemethere/new_ver_scheme
Enable new test versioning scheme
Upstream-commit: 27d07d7e2dbf81001e402657c0e45c375e73a369
Component: packaging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment