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

Assume volume is detached if node doesn't exist #29485

Merged

Conversation

saad-ali
Copy link
Member

Fixes #29358

@saad-ali saad-ali added release-note Denotes a PR that will be considered when it comes time to generate release notes. cherrypick-candidate labels Jul 23, 2016
@saad-ali saad-ali added this to the v1.3 milestone Jul 23, 2016
@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 23, 2016
@@ -869,7 +869,7 @@ func (c *Cloud) InstanceID(name string) (string, error) {
}
inst, err := c.getInstanceByNodeName(name)
if err != nil {
return "", err
return "", fmt.Errorf("getInstanceByNodeName failed for %q with %v", name, err)
Copy link
Member

@justinsb justinsb Jul 23, 2016

Choose a reason for hiding this comment

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

Yes, we have to be really careful with when we return InstanceNotFound. According to the comments on cloudprovider.Instances, we must return InstanceNotFound, but actually that's wrong and it only applies to ExternalID (AFAICT), and you didn't wrap it there. I'll put in a separate PR to fix the comments.

To (try to) be clear: But what you're done here is right, though it would be wrong if the docs were right. At least I think so!

@justinsb
Copy link
Member

LGTM

@justinsb
Copy link
Member

Doc fix for the contract: #29490

@saad-ali saad-ali force-pushed the fixIssue29358InstanceNotFound branch from fa2e107 to 89fd358 Compare July 23, 2016 05:07
@saad-ali
Copy link
Member Author

Thanks @justinsb

@k8s-bot
Copy link

k8s-bot commented Jul 23, 2016

GCE e2e build/test passed for commit 89fd358.

@matchstick matchstick added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 23, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Jul 23, 2016

GCE e2e build/test passed for commit 89fd358.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit ce4d73f into kubernetes:master Jul 23, 2016
@fabioy fabioy added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jul 24, 2016
fabioy added a commit that referenced this pull request Jul 26, 2016
#29485-upstream-release-1.3

Automated cherry pick of #24385 #29485 upstream release 1.3
nodeName,
err)
return nil
Copy link
Member

Choose a reason for hiding this comment

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

should this be continuing (as per the comment), rather than returning from the whole func?

Copy link
Member Author

Choose a reason for hiding this comment

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

The behavior is correct. Perhaps the comment can be clarified. "Move on" in this case means abandon trying to update the status of a node (since it no longer exists).

Copy link
Member

Choose a reason for hiding this comment

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

ok, wasn't sure if it was intending to also short-circuit and not update any of the other remaining nodes, or if a bad nodeName could permanently block ever getting to update those nodes' status

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…ck-of-#24385-kubernetes#29485-upstream-release-1.3

Automated cherry pick of kubernetes#24385 kubernetes#29485 upstream release 1.3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants