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

Enable Portworx Storage Driver #15862

Merged
merged 3 commits into from
Aug 30, 2017
Merged

Enable Portworx Storage Driver #15862

merged 3 commits into from
Aug 30, 2017

Conversation

adityadani
Copy link
Contributor

This change

  • Enables portworx storage driver through the kubernetes volume plugins API.
  • Reverts commit - dcb5eef
  • Removes the duplicate proto generation error.

@openshift-ci-robot openshift-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 18, 2017
@openshift-ci-robot
Copy link

Hi @adityadani. Thanks for your PR.

I'm waiting for a openshift 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.

@openshift-merge-robot openshift-merge-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Aug 18, 2017
@adityadani
Copy link
Contributor Author

@deads2k I have modified the vendor'ed directories used by Portworx plugin to remove the "duplicate proto registered" error.

@openshift-merge-robot openshift-merge-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 18, 2017
deads2k
deads2k reviewed Aug 18, 2017
View reviewed changes
vendor/github.com/libopenstorage/openstorage/api/api.pb.go
@@ -7,7 +7,7 @@ package api
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
import math "math"
import google_protobuf "go.pedge.io/pb/go/google/protobuf"
import google_protobuf "github.com/golang/protobuf/ptypes/timestamp"
Copy link
Contributor

Choose a reason for hiding this comment

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

@smarterclayton this is a carry and I don't know what it does. Do you?

Copy link
Contributor Author

@adityadani adityadani Aug 18, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

Previously there were two different protobuf versions being used. I updated this vendor'ed code used by portworx to use the same protobuf version which others are using in openshift. Now we won't get the duplicate proto error.

Copy link
Contributor

Choose a reason for hiding this comment

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

Previously there were two different protobuf versions being used. I updated this vendor'ed code used by portworx to use the same protobuf version which others are using in openshift. Now we won't get the duplicate proto error.

Oh, ok. Then this isn't a carry. <carry> is a commit that updates code in a way that the upstream project rejected (or would reject if you know the project very well). What you have done is a bump. You should combine the code change the godep.json change into a single commit with a name like bump(github.com/libopenstorage/openstorage): a53f5e5662367da02b95470980c5dbaadfe96c99

Copy link
Contributor

Choose a reason for hiding this comment

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

commit with a name like bump(github.com/libopenstorage/openstorage): a53f5e5662367da02b95470980c5dbaadfe96c99

We use that format to be able to find when we picked up particular levels to find particular patches. A couple scripts rely on it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have updated the commits.

deads2k
deads2k reviewed Aug 18, 2017
View reviewed changes
Godeps/Godeps.json
@@ -2535,27 +2535,27 @@
},
{
"ImportPath": "github.com/libopenstorage/openstorage/api",
"Rev": "6e787003b91ddba85f108b8aede075b1af0d3606"
"Rev": "a53f5e5662367da02b95470980c5dbaadfe96c99"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why did this bump if you have made a carry commit? Did something else change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I might have understood the meaning of "carry" differently.
I updated this vendor'ed file to that particular commit. Should the commit message then be different?

@adityadani
Copy link
Contributor Author

@deads2k @smarterclayton Can you enable tests on this PR ?

@smarterclayton
Copy link
Contributor

/ok-to-test

@openshift-ci-robot openshift-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 23, 2017
@deads2k
Copy link
Contributor

deads2k commented Aug 24, 2017

I have updated the commits.

Thanks

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 24, 2017
@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 24, 2017
@openshift-bot
Copy link
Contributor

/retest

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

@deads2k
Copy link
Contributor

deads2k commented Aug 24, 2017

job died. I'm going to cancel the rest to free the queue and retest

@deads2k
Copy link
Contributor

deads2k commented Aug 24, 2017

/retest

1 similar comment
@deads2k
Copy link
Contributor

deads2k commented Aug 24, 2017

/retest

@adityadani
Copy link
Contributor Author

The extended _conformance_install_update failed with this error :
Removing containers and the following error:
rm: cannot remove ‘/tmp/etcd/openshift-backup-etcd_backup_tag20170824144459’: Permission denied
@deads2k Is this an intermittent error ?

@openshift-bot
Copy link
Contributor

/retest

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

@deads2k
Copy link
Contributor

deads2k commented Aug 25, 2017

The extended _conformance_install_update failed with this error :
Removing containers and the following error:
rm: cannot remove ‘/tmp/etcd/openshift-backup-etcd_backup_tag20170824144459’: Permission denied
@deads2k Is this an intermittent error ?

it is :( . We're battling a few flakes at the moment. Looks like the bot got you sorted.

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 26, 2017
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Aug 29, 2017
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 29, 2017
@adityadani
Copy link
Contributor Author

@deads2k I had to rebase my changes to fix some conflicts. Can you add the lgtm back? Also the flaky test failed again in the previous run.

@deads2k
Copy link
Contributor

deads2k commented Aug 30, 2017

/retest
/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adityadani, deads2k

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

@deads2k
Copy link
Contributor

deads2k commented Aug 30, 2017

bumping queue priority since its getting stuck in rebases.

@adityadani
Copy link
Contributor Author

/retest

@openshift-merge-robot
Copy link
Contributor

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

@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 30, 2017 •
edited
Loading

@adityadani: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/unit 128f452 link /test unit
ci/openshift-jenkins/extended_conformance_gce 128f452 link /test extended_conformance_gce

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue (batch tested with PRs 15862, 15781, 15944)

@openshift-merge-robot openshift-merge-robot merged commit 4a85dec into openshift:master Aug 30, 2017
@adityadani adityadani mentioned this pull request Aug 30, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deads2k deads2k deads2k left review comments

Assignees

@liggitt liggitt

@smarterclayton smarterclayton

@deads2k deads2k

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. queue/multiple-rebases size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@adityadani @openshift-ci-robot @smarterclayton @deads2k @openshift-bot @openshift-merge-robot @liggitt