Skip to content
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.

Sign up for GitHub

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

Jump to bottom

make docker-checker more robust #23662

Merged
merged 1 commit into from
Mar 31, 2016
Merged

make docker-checker more robust #23662

merged 1 commit into from
Mar 31, 2016

Conversation

ArtfulCoder
Copy link
Contributor

Partly addresses: #23556 by forcefully kill problematic docker processes.

@ArtfulCoder
Copy link
Contributor Author

partly addresses #23556

@ArtfulCoder ArtfulCoder added the sig/node Categorizes an issue or PR as relevant to SIG Node. label Mar 31, 2016
@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 31, 2016
@k8s-github-robot
Copy link

Labelling this PR as size/S

@dchen1107 dchen1107 mentioned this pull request Mar 31, 2016
Closed
@k8s-bot
Copy link

k8s-bot commented Mar 31, 2016

GCE e2e build/test passed for commit 2e8d4cababa76b2d38a10f1bda8d17c753a22501.

@k8s-bot
Copy link

k8s-bot commented Mar 31, 2016

GCE e2e build/test passed for commit 450719719152b500a1831d2df042fd5232a014dc.

@roberthbailey roberthbailey added this to the v1.2 milestone Mar 31, 2016
yujuhong
yujuhong reviewed Mar 31, 2016
View reviewed changes
cluster/saltbase/salt/supervisor/docker-checker.sh
@@ -35,7 +46,7 @@ echo "waiting 30s for startup"
sleep 30

while true; do
if ! sudo timeout 10 docker version > /dev/null; then
if ! sudo timeout 10 docker ps > /dev/null; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

10 second is not enough for docker ps at heavy load based on the past experiences (we changed it to docker ps and then back to docker version once). We'd need a longer timeout. cc @dchen1107

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, why are we using sudo.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, please increase the timeout value to 30 second here. sudo can be removed.

@ArtfulCoder
Copy link
Contributor Author

PTAL

@k8s-bot
Copy link

k8s-bot commented Mar 31, 2016

GCE e2e build/test passed for commit 736c02c.

@dchen1107
Copy link
Member

LGTM

@dchen1107 dchen1107 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 31, 2016
@a-robinson
Copy link
Contributor

Manually merging to reduce flakiness

@a-robinson a-robinson merged commit d41d505 into kubernetes:master Mar 31, 2016
@david-mcmahon
Copy link
Contributor

The cherrypick process is defined here. Hoping to get this PR merged today, but the details are here. You need to run the cherry pick tool yourself to get these onto the branch. @bgrant0607 will then approve them for merge.

@ArtfulCoder ArtfulCoder mentioned this pull request Mar 31, 2016
Merged
@bgrant0607
Copy link
Member

Every cherrypick needs a release note.

@bgrant0607 bgrant0607 added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Mar 31, 2016
@bgrant0607
Copy link
Member

This PR has no description and no reference to a P0 issue.

@cjcullen
Copy link
Member

Fixes the "docker flakes on nodes and masters" part of #23556.

@cjcullen
Copy link
Member

Internal bugref: 27875273

@dchen1107
Copy link
Member

@bgrant0607 #23556 is p0 issue. I have a small summary related to the issue at: #23556 (comment)

@bgrant0607 bgrant0607 added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 31, 2016
bgrant0607 added a commit that referenced this pull request Mar 31, 2016
@bgrant0607
Merge pull request #23687 from ArtfulCoder/automated-cherry-pick-of-#…
38b11ba 
…23662-upstream-release-1.2

Automated cherry pick of #23662
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.2" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@bgrant0607
Merge pull request kubernetes#23687 from ArtfulCoder/automated-cherry…
c2f75bc 
…-pick-of-#23662-upstream-release-1.2

Automated cherry pick of kubernetes#23662
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@bgrant0607
Merge pull request kubernetes#23687 from ArtfulCoder/automated-cherry…
4ea8b67 
…-pick-of-#23662-upstream-release-1.2

Automated cherry pick of kubernetes#23662
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dchen1107 dchen1107

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.