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

Automated cherry pick of #49118 upstream release 1.7 #50596

Merged
merged 1 commit into from
Aug 24, 2017
Merged

Automated cherry pick of #49118 upstream release 1.7 #50596

merged 1 commit into from
Aug 24, 2017

Conversation

adelton
Copy link
Contributor

@adelton adelton commented Aug 14, 2017 •
edited by wojtek-t
Loading

Cherry pick of #49118 on release-1.7.

#49118 : Allow unmounting bind-mounted directories

It is now posible to use flexVolumes to bind mount directories and files.

@adelton
Allow unmounting bind-mounted directories.
c0c44ae 
For bind-mounted directories, the isNotMounted which calls
IsLikelyNotMountPoint fails because the filesystem of the mounted
location and the parent directory are the same.

Addressing:
unmounter.go:59] Warning: Path: /path/.../test-dir already unmounted

(cherry picked from commit 6b7d4b7)
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 14, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @adelton. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 14, 2017
@adelton adelton mentioned this pull request Aug 14, 2017
Merged
@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Aug 14, 2017
@jsafrane
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 14, 2017
@jsafrane
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 14, 2017
@adelton
Copy link
Contributor Author

adelton commented Aug 14, 2017

/retest

2 similar comments
@adelton
Copy link
Contributor Author

adelton commented Aug 14, 2017

/retest

@adelton
Copy link
Contributor Author

adelton commented Aug 21, 2017

/retest

@adelton
Copy link
Contributor Author

adelton commented Aug 21, 2017

The https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/pr-logs/pull/50596/pull-kubernetes-kubemark-e2e-gce/46805/ seems to have failed with https://storage.googleapis.com/kubernetes-jenkins/pr-logs/pull/50596/pull-kubernetes-kubemark-e2e-gce/46805/build-log.txt saying

W0821 09:11:15.837] 2017/08/21 09:11:15 util.go:133: Step './hack/e2e-internal/e2e-down.sh' finished in 14.372007393s
W0821 09:11:15.837] 2017/08/21 09:11:15 main.go:204: Saved XML output to /workspace/_artifacts/junit_runner.xml.
W0821 09:11:15.837] 2017/08/21 09:11:15 main.go:245: Something went wrong: starting e2e cluster: error during ./hack/e2e-internal/e2e-up.sh: exit status 1
W0821 09:11:16.391] Run: ('sudo', 'chmod', '-R', 'o+r', '/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce/go/src/k8s.io/kubernetes/_artifacts')
W0821 09:11:16.398] Traceback (most recent call last):
W0821 09:11:16.398]   File "/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce/./test-infra/jenkins/../scenarios/kubernetes_e2e.py", line 682, in <module>
W0821 09:11:16.398]     main(parse_args())
W0821 09:11:16.398]   File "/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce/./test-infra/jenkins/../scenarios/kubernetes_e2e.py", line 545, in main
W0821 09:11:16.398]     mode.start(runner_args)
W0821 09:11:16.398]   File "/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce/./test-infra/jenkins/../scenarios/kubernetes_e2e.py", line 346, in start
W0821 09:11:16.398]     check(*cmd)
W0821 09:11:16.398]   File "/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce/./test-infra/jenkins/../scenarios/kubernetes_e2e.py", line 47, in check
W0821 09:11:16.399]     subprocess.check_call(cmd)
W0821 09:11:16.399]   File "/usr/lib/python2.7/subprocess.py", line 186, in check_call
W0821 09:11:16.399]     raise CalledProcessError(retcode, cmd)
W0821 09:11:16.400] subprocess.CalledProcessError: Command '('docker', 'run', '--rm', '--name=pull-kubernetes-kubemark-e2e-gce-46805', '-v', '/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce/go/src/k8s.io/kubernetes/_artifacts:/workspace/_artifacts', '-v', '/etc/localtime:/etc/localtime:ro', '-v', '/var/run/docker.sock:/var/run/docker.sock', '-e', 'HOME=/workspace', '-e', 'WORKSPACE=/workspace', '--env-file', '/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce/./test-infra/jenkins/../scenarios/../jobs/platform/gce.env', '--env-file', '/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce/./test-infra/jenkins/../scenarios/../jobs/env/pull-kubernetes-kubemark-e2e-gce.env', '-e', 'KUBETEST_MANUAL_DUMP=y', '-v', '/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce@tmp/secretFiles/2e231dac-bf20-42d7-9ad4-9eeacea7a978/kubernetes-jenkins-pull-c67f9519f993.json:/service-account.json:ro', '-v', '/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce/go/src/k8s.io/kubernetes:/go/src/k8s.io/kubernetes', '-v', '/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce/go/src/k8s.io/release:/go/src/k8s.io/release', '-v', '/home/jenkins/.ssh/google_compute_engine:/workspace/.ssh/google_compute_engine:ro', '-v', '/home/jenkins/.ssh/google_compute_engine.pub:/workspace/.ssh/google_compute_engine.pub:ro', '-e', 'JENKINS_GCE_SSH_PRIVATE_KEY_FILE=/workspace/.ssh/google_compute_engine', '-e', 'JENKINS_GCE_SSH_PUBLIC_KEY_FILE=/workspace/.ssh/google_compute_engine.pub', '-e', 'JENKINS_HOME=/var/lib/jenkins', '-e', 'PULL_BASE_REF=release-1.7', '-e', 'BUILD_CAUSE=MANUALTRIGGER', '-e', 'HUDSON_URL=http://goto.google.com/prkubekins/', '-e', 'BUILD_URL=http://goto.google.com/prkubekins/job/pull-kubernetes-kubemark-e2e-gce/46805/', '-e', 'BOOTSTRAP_MIGRATION=yes', '-e', 'CLOUDSDK_CONFIG=/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce/go/src/k8s.io/kubernetes/.config/gcloud', '-e', 'BUILD_TAG=jenkins-pull-kubernetes-kubemark-e2e-gce-46805', '-e', 'HUDSON_SERVER_COOKIE=32617aabcc4952a0', '-e', 'JENKINS_URL=http://goto.google.com/prkubekins/', '-e', 'LOGNAME=jenkins', '-e', 'USER=jenkins', '-e', 'NODE_LABELS=agent-pr-68 pull', '-e', 'JOB_NAME=pull-kubernetes-kubemark-e2e-gce', '-e', 'LANG=en_US.UTF-8', '-e', 'RUN_DISPLAY_URL=http://goto.google.com/prkubekins/job/pull-kubernetes-kubemark-e2e-gce/46805/display/redirect', '-e', 'SHELL=/bin/bash', '-e', 'buildId=cc11c2c3-864c-11e7-967d-0a580a6c1150', '-e', 'HUDSON_HOME=/var/lib/jenkins', '-e', 'JOB_URL=http://goto.google.com/prkubekins/job/pull-kubernetes-kubemark-e2e-gce/', '-e', 'ROOT_BUILD_CAUSE_MANUALTRIGGER=true', '-e', 'BUILD_CAUSE_MANUALTRIGGER=true', '-e', 'GCS_ARTIFACTS_DIR=gs://kubernetes-jenkins/pr-logs/pull/50596/pull-kubernetes-kubemark-e2e-gce/46805/artifacts', '-e', 'JENKINS_AWS_CREDENTIALS_FILE=/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce@tmp/secretFiles/c537ac88-96fd-4abb-a220-ebc5e7832521/KubernetesPresubmitTests.txt', '-e', 'ROOT_BUILD_CAUSE=MANUALTRIGGER', '-e', 'SSH_CLIENT=10.240.0.2 51178 22', '-e', 'BUILD_ID=46805', '-e', 'BUILD_NUMBER=46805', '-e', 'XDG_RUNTIME_DIR=/run/user/1000', '-e', 'HUDSON_COOKIE=0884084a-4319-416c-ae9d-107ac171e9c7', '-e', 'JENKINS_AWS_SSH_PRIVATE_KEY_FILE=/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce@tmp/secretFiles/33aa843e-0134-4c72-adff-de0d96aca252/id_rsa.jenkins', '-e', 'JOB_BASE_NAME=pull-kubernetes-kubemark-e2e-gce', '-e', 'RUN_CHANGES_DISPLAY_URL=http://goto.google.com/prkubekins/job/pull-kubernetes-kubemark-e2e-gce/46805/display/redirect?page=changes', '-e', 'XDG_SESSION_ID=476', '-e', 'JENKINS_GCE_SSH_PUBLIC_KEY_FILE=/home/jenkins/.ssh/google_compute_engine.pub', '-e', '_=./test-infra/jenkins/bootstrap.py', '-e', 'OLDPWD=/home/jenkins', '-e', 'JOB_DISPLAY_URL=http://goto.google.com/prkubekins/job/pull-kubernetes-kubemark-e2e-gce/display/redirect', '-e', 'JENKINS_AWS_SSH_PUBLIC_KEY_FILE=/var/lib/jenkins/workspace/pull-kubernetes-kubemark-e2e-gce@tmp/secretFiles/3f5c77e4-3871-408e-baa7-8f23012f5e28/id_rsa.jenkins.pub', '-e', 'EXECUTOR_NUMBER=0', '-e', 'NODE_NAME=agent-pr-68', '-e', 'PULL_NUMBER=50596', '-e', 'SHLVL=2', '-e', 'JENKINS_SERVER_COOKIE=32617aabcc4952a0', '-e', 'BUILD_DISPLAY_NAME=#46805', '-e', 'PULL_REFS=release-1.7:423592b27133c7d7e23eafdd1517d0167b53d500,50596:c0c44aedf8958aab792f3c25128ccf7cf6357fdb', '-e', 'JENKINS_GCE_SSH_PRIVATE_KEY_FILE=/home/jenkins/.ssh/google_compute_engine', '-e', 'MAIL=/var/mail/jenkins', '-e', 'SSH_CONNECTION=10.240.0.2 51178 10.240.0.40 22', '-e', 'CLOUDSDK_COMPONENT_MANAGER_DISABLE_UPDATE_CHECK=true', '-e', 'CLOUDSDK_EXPERIMENTAL_FAST_COMPONENT_UPDATE=false', '-e', 'KUBE_AWS_INSTANCE_PREFIX=e2e-46805', '-e', 'INSTANCE_PREFIX=e2e-46805', '-e', 'KUBE_GCE_INSTANCE_PREFIX=e2e-46805', 'gcr.io/k8s-testimages/kubekins-e2e:v20170818-ed12f438', '-v', '--dump=/workspace/_artifacts', '--gcp-service-account=/service-account.json', '--build', '--up', '--down', '--cluster=e2e-46805', '--gcp-network=e2e-46805', '--extract=local', '--gcp-project=k8s-jkns-pr-kubemark', '--gcp-zone=us-central1-f', '--kubemark', '--kubemark-master-size=n1-standard-1', '--kubemark-nodes=5', '--provider=gce', '--stage=gs://kubernetes-release-pull/ci/pull-kubernetes-kubemark-e2e-gce', '--test_args=--ginkgo.focus=\\[Feature:Empty\\] --gather-resource-usage=true --garbage-collector-enabled=true', '--timeout=45m')' returned non-zero exit status 1

I assume it's no related to this pull request.

@adelton
Copy link
Contributor Author

adelton commented Aug 21, 2017

/test pull-kubernetes-kubemark-e2e-gce

@adelton
Copy link
Contributor Author

adelton commented Aug 21, 2017

/retest

@adelton adelton mentioned this pull request Aug 21, 2017
Closed
@NickrenREN
Copy link
Contributor

/retest

@adelton
Copy link
Contributor Author

adelton commented Aug 22, 2017

@jsafrane, we seem to have tests passing thanks to #51008. What are the best next steps to get this cherry pick approved?

@jsafrane
Copy link
Member

@adelton: @wojtek-t is the release manager for 1.7.x and he needs to approve it. Having an github issue that this PR fixes linked in the first comment would help.

@adelton
Copy link
Contributor Author

adelton commented Aug 22, 2017 •
edited
Loading

Thanks. Well, we don't have an issue, really, #49118 did not have one either.

This cherry pick PR comes from #49118 (comment) where @resouer shows the workaround he has to use to overcome that IsLikelyNotMountPoint check.

So this is mostly usability thing, making bind-mount easier even in 1.7.

@wojtek-t wojtek-t changed the title Allow unmounting bind-mounted directories: cherry pick to 1.7. Automated cherry pick of #49118 upstream release 1.7 Aug 23, 2017
@wojtek-t wojtek-t added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Aug 23, 2017
@wojtek-t wojtek-t added this to the v1.7 milestone Aug 23, 2017
@wojtek-t
Copy link
Member

/approve no-issue

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adelton, jsafrane, wojtek-t

Associated issue: 49118

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

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to @fejta).

Review the full test history for this PR.

3 similar comments
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to @fejta).

Review the full test history for this PR.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to @fejta).

Review the full test history for this PR.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to @fejta).

Review the full test history for this PR.

@k8s-github-robot
Copy link

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

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 764e4b3 into kubernetes:release-1.7 Aug 24, 2017
@resouer
Copy link
Contributor

resouer commented Sep 4, 2017 •
edited
Loading

Confirmed this is cherry picked in 1.7.5, thanks!

This was referenced Sep 4, 2017
Closed
Closed
@adelton adelton deleted the flex-bind-mount-1.7 branch February 12, 2018 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jsafrane jsafrane

@derekwaynecarr derekwaynecarr

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.
9 participants
@adelton @k8s-ci-robot @jsafrane @NickrenREN @wojtek-t @k8s-github-robot @fejta-bot @resouer @derekwaynecarr