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.

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

[Test Fix] Fake docker client can remove containers which have not been started #56821

Merged

Conversation

dashpole
Copy link
Contributor

@dashpole dashpole commented Dec 4, 2017

What this PR does / why we need it:
During kubemark-5000 scalability tests, which use the fake docker client, we encountered a bug where containers where the pod was deleted before the container was started could not be deleted.
This is because we only remove pods from the ExitedContainers list. Containers are only added to this when they have been created, started, and then stopped. However, containers that have only been created, but not started cannot be deleted. This PR fixes this issue by allowing containers with State.Running=false to be deleted.

Which issue(s) this PR fixes:
Ref #53327

Release note:

NONE

/sig node
/kind bug
/priority critical-urgent
/assign @Random-Liu @dchen1107 @shyamjvs

@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Dec 4, 2017
@k8s-ci-robot k8s-ci-robot added sig/node Categorizes an issue or PR as relevant to SIG Node. kind/bug Categorizes issue or PR as related to a bug. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 4, 2017
@dashpole dashpole added this to the v1.9 milestone Dec 4, 2017
@dashpole
Copy link
Contributor Author

dashpole commented Dec 4, 2017

/retest

1 similar comment
@dashpole
Copy link
Contributor Author

dashpole commented Dec 4, 2017

/retest

@k8s-github-robot
Copy link

[MILESTONENOTIFIER] Milestone Pull Request Needs Attention

@Random-Liu @dashpole @dchen1107 @shyamjvs @kubernetes/sig-node-misc

Action required: During code freeze, pull requests in the milestone should be in progress.
If this pull request is not being actively worked on, please remove it from the milestone.
If it is being worked on, please add the status/in-progress label so it can be tracked with other in-flight pull requests.

Note: This pull request is marked as priority/critical-urgent, and must be updated every 1 day during code freeze.

Example update:

ACK.  In progress
ETA: DD/MM/YYYY
Risks: Complicated fix required
Pull Request Labels
  • sig/node: Pull Request will be escalated to these SIGs if needed.
  • priority/critical-urgent: Never automatically move pull request out of a release milestone; continually escalate to contributor and SIG through all available channels.
  • kind/bug: Fixes a bug discovered during the current release.
Help

@shyamjvs
Copy link
Member

shyamjvs commented Dec 4, 2017

Approved for milestone as this is an important fix for failing kubemark tests.

/lgtm
Will let someone from node team also to review.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 4, 2017
@shyamjvs
Copy link
Member

shyamjvs commented Dec 5, 2017

@krzyzacy The kubemark presubmit failure here seems to be due to your D-in-D migration?

I1204 23:21:08.408] Copying kubemark binary to /go/src/k8s.io/kubernetes/kubernetes/cluster/images/kubemark
I1204 23:21:08.557] docker build --pull -t gcr.io/k8s-jkns-pr-kubemark/kubemark .
W1204 23:21:09.544] Cannot connect to the Docker daemon. Is the docker daemon running on this host?
W1204 23:21:09.547] make: *** [build] Error 1

@shyamjvs
Copy link
Member

shyamjvs commented Dec 5, 2017

/retest

(hoping it's fixed with kubernetes/test-infra#5807)

@krzyzacy
Copy link
Member

krzyzacy commented Dec 5, 2017

obviously missed retest here, it should pass now.

@shyamjvs
Copy link
Member

shyamjvs commented Dec 5, 2017

Hmm.. it seems like the pull job is already using the new image. Do you know what happened?

@shyamjvs
Copy link
Member

shyamjvs commented Dec 5, 2017

Ok.. let's see.

@krzyzacy
Copy link
Member

krzyzacy commented Dec 5, 2017

yeah, I fixed this in kubernetes/test-infra#5802

@wojtek-t
Copy link
Member

wojtek-t commented Dec 5, 2017

/approve

@dashpole - thanks for the fix!

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 5, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dashpole, shyamjvs, wojtek-t

Associated issue: 53327

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@shyamjvs
Copy link
Member

shyamjvs commented Dec 5, 2017

/retest

@k8s-github-robot
Copy link

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 923abd0 into kubernetes:master Dec 5, 2017
@dashpole dashpole deleted the fake_client_running_containers branch December 5, 2017 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. milestone/needs-attention priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants