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

UPSTREAM: 49118: Allow unmounting bind-mounted directories. #15294

Merged
merged 1 commit into from
Aug 12, 2017

Conversation

adelton
Copy link
Contributor

@adelton adelton commented Jul 18, 2017

For files, we cannot use path/..;
we could use filepath.Dir but for bind-mounted, isNotMounted
which calls IsLikelyNotMountPoint would not work anyway.
Let's just have the driver do the work.

Addressing

Error: UnmountVolume.TearDown failed for volume "..." (volume.spec.Name: "...") pod "..." (UID: "...") with: lstat /path/.../test-flex/..: not a directory

@adelton
Copy link
Contributor Author

adelton commented Jul 18, 2017

Cc @simo5, @openshift/security.

@php-coder
Copy link
Contributor

php-coder commented Jul 18, 2017

@adelton When you're editing files inside vendor/k8s.io/kubernetes directory then 1) you must follow some special conventions for commit's description 2) in many cases you should submit the similar fix to the Kubernetes itself (or even only to the Kubernetes if it's not critical to OpenShift).

@pweil-
Copy link
Contributor

pweil- commented Jul 18, 2017

@openshift/storage

@php-coder
Copy link
Contributor

you must follow some special conventions for commit's description

I see that Travis already has failing the build with the error about that:

===== Verifying UPSTREAM Commits =====

The following commits contain Godeps changes but aren't declared as UPSTREAM:

[de66f0e] Allow unmounting bind-mounted files.

  - vendor/k8s.io/kubernetes/pkg/volume/flexvolume/unmounter.go

Unfortunately it doesn't mention what are these conventions. Here is the link that I'm using:

UPSTREAM commit summaries should look like:
UPSTREAM: [non-kube-repo/name: ]<PR number|carry|drop>: description
UPSTREAM commits which revert previous UPSTREAM commits should look like:
UPSTREAM: revert: <sha>: <normal upstream format>
UPSTREAM commits are validated against the following regular expression:
{{ .Pattern }}
Examples of valid summaries:
UPSTREAM: 12345: A kube fix
UPSTREAM: coreos/etcd: 12345: An etcd fix
UPSTREAM: <carry>: A carried kube change
UPSTREAM: <drop>: A dropped kube change
UPSTREAM: revert: abcd123: coreos/etcd: 12345: An etcd fix
UPSTREAM: k8s.io/heapster: 12345: A heapster fix

@pweil-
Copy link
Contributor

pweil- commented Jul 18, 2017

Unfortunately it doesn't mention what are these conventions

See https://github.com/openshift/origin/blob/master/HACKING.md#using-hackcherry-pick

@liggitt
Copy link
Contributor

liggitt commented Jul 18, 2017

this should be opened upstream for review and approval first.

we only pick changes into origin if they are fixing release-blocking bugs, otherwise we wait to pick up the kube level with upstream improvements

@adelton
Copy link
Contributor Author

adelton commented Jul 18, 2017

Filed upstream now: kubernetes/kubernetes#49118. Let's see.

@adelton adelton changed the title Allow unmounting bind-mounted files. Allow unmounting bind-mounted files. [pending review upstream] Jul 18, 2017
@openshift-merge-robot openshift-merge-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 24, 2017
@jsafrane
Copy link
Contributor

@adelton, please update the commit message.

https://github.com/openshift/origin/blob/master/HACKING.md#using-hackcherry-pick says:

All upstream commits should have a commit message where the first line is:
UPSTREAM: <PR number|drop|carry>: <short description>

Check git log for examples.

@adelton
Copy link
Contributor Author

adelton commented Jul 25, 2017

The kubernetes/kubernetes#49118 was merged. Do we want to get that change in to OpenShift Origin now, making testing with bind-mounted directories (and files) easier, or wait for rebase and drop this pull request?

@jsafrane jsafrane changed the title Allow unmounting bind-mounted files. [pending review upstream] Allow unmounting bind-mounted files. Jul 25, 2017
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
@adelton adelton changed the title Allow unmounting bind-mounted files. Allow unmounting bind-mounted directories. Jul 25, 2017
@adelton
Copy link
Contributor Author

adelton commented Jul 25, 2017

Updated commit message, rebased on master -> 139e0d5.

@jsafrane
Copy link
Contributor

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 139e0d5

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/3477/) (Base Commit: 970dc61) (PR Branch Commit: 139e0d5)

@jsafrane
Copy link
Contributor

[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Jul 25, 2017

continuous-integration/openshift-jenkins/merge Waiting: You are in the build queue at position: 2

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 139e0d5

@adelton adelton changed the title Allow unmounting bind-mounted directories. UPSTREAM: 49118: Allow unmounting bind-mounted directories. Jul 25, 2017
@sttts sttts assigned derekwaynecarr and unassigned sttts Jul 26, 2017
@openshift-merge-robot openshift-merge-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 28, 2017
@jsafrane
Copy link
Contributor

/approve no-issue

@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 31, 2017
@adelton
Copy link
Contributor Author

adelton commented Aug 7, 2017

What can be done to get this merged? That "Submit Queue" check does not really give much clue about what it feels is wrong with the change.

@jsafrane
Copy link
Contributor

jsafrane commented Aug 9, 2017

/test all

@jsafrane
Copy link
Contributor

jsafrane commented Aug 9, 2017

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 9, 2017
@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@jsafrane
Copy link
Contributor

jsafrane commented Aug 9, 2017

/test ci/openshift-jenkins/extended_templates

@jsafrane
Copy link
Contributor

jsafrane commented Aug 9, 2017

/test extended_templates

@openshift-merge-robot
Copy link
Contributor

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

@jsafrane
Copy link
Contributor

/retest

1 similar comment
@jsafrane
Copy link
Contributor

/retest

@adelton
Copy link
Contributor Author

adelton commented Aug 10, 2017

Those https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin_extended_conformance_install_update/3880/ failures don't seem like something this patch could have caused. What is the best way to report / escalate those, @jsafrane ?

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@jsafrane
Copy link
Contributor

/retest

@openshift-merge-robot
Copy link
Contributor

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

@jsafrane
Copy link
Contributor

/retest

1 similar comment
@jsafrane
Copy link
Contributor

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot
Copy link
Contributor

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

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue

@openshift-merge-robot openshift-merge-robot merged commit ef7d658 into openshift:master Aug 12, 2017
@adelton adelton deleted the flex-bind-mount branch September 8, 2017 06:56
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. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants