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

Bug 1798596: take into consideration all instance states for deletion #291

Merged
merged 2 commits into from
Feb 6, 2020
Merged

Bug 1798596: take into consideration all instance states for deletion #291

merged 2 commits into from
Feb 6, 2020

Conversation

enxebre
Copy link
Member

@enxebre enxebre commented Feb 5, 2020 •
edited
Loading

This fix deletion to take into consideration all instance states when deleting.
Otherwise instances with a provider state different than running will be leaked when deleting a machine.

@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Feb 5, 2020
@enxebre
Copy link
Member Author

enxebre commented Feb 5, 2020

/cherry-pick release-4.3

@openshift-ci-robot
Copy link

@enxebre: This pull request references Bugzilla bug 1798596, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Bug 1798596: take into consideration all instance state for deletion

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.

@openshift-cherrypick-robot
Copy link

@enxebre: once the present PR merges, I will cherry-pick it on top of release-4.3 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.3

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.

bison
bison approved these changes Feb 5, 2020
View reviewed changes
Copy link

@bison bison left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2020
JoelSpeed
JoelSpeed reviewed Feb 5, 2020
View reviewed changes
Copy link

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

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

/approve

This creates a conflict with #290 but better to resolve there I reckon

/hold

Unhold once that's acked

pkg/actuators/machine/actuator.go
if err != nil {
glog.Errorf("%s: error getting running instances: %v", machine.Name, err)
glog.Errorf("%s: error getting existing instances: %v", machine.Name, err)
Copy link

Choose a reason for hiding this comment

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

How do we resolve the conflict this creates with #290? Within #290 once this is merged is probably easiest right? cc @alexander-demichev

Copy link
Member Author

Choose a reason for hiding this comment

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

thanks! let's hold the other ones and let this move forwards as it's an important bug fix that we want to back port to 4.3 right away.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 5, 2020
@JoelSpeed
Copy link

/unhold

@enxebre
Copy link
Member Author

enxebre commented Feb 5, 2020

/approve
in behalf of #291 (review)
@JoelSpeed you need to add yourself to approvers :)

/hold cancel
because of #291 (comment)

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 5, 2020
@enxebre
Copy link
Member Author

enxebre commented Feb 5, 2020

/approve

1 similar comment
@bison
Copy link

bison commented Feb 5, 2020

/approve

@enxebre enxebre added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 5, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bison, enxebre, JoelSpeed

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-bot
Copy link

/retest

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

@enxebre
Copy link
Member Author

enxebre commented Feb 6, 2020

/retest

@openshift-merge-robot openshift-merge-robot merged commit a9480fe into openshift:master Feb 6, 2020
@openshift-ci-robot
Copy link

@enxebre: All pull requests linked via external trackers have merged. Bugzilla bug 1798596 has been moved to the MODIFIED state.

In response to this:

Bug 1798596: take into consideration all instance state for deletion

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.

@openshift-cherrypick-robot
Copy link

@enxebre: #291 failed to apply on top of branch "release-4.3":

Applying: Remove unused client and function getRunningInstance
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/actuators/machine/awsclient.go
M	pkg/actuators/machine/utils.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/actuators/machine/utils.go
Removing pkg/actuators/machine/awsclient_test.go
CONFLICT (modify/delete): pkg/actuators/machine/awsclient.go deleted in Remove unused client and function getRunningInstance and modified in HEAD. Version HEAD of pkg/actuators/machine/awsclient.go left in tree.
Patch failed at 0002 Remove unused client and function getRunningInstance

In response to this:

/cherry-pick release-4.3

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.

This was referenced Feb 6, 2020
Merged
Merged
@enxebre enxebre changed the title Bug 1798596: take into consideration all instance state for deletion Bug 1798596: take into consideration all instance states for deletion Feb 6, 2020
@openshift-ci-robot
Copy link

@enxebre: Bugzilla bug 1798596 is in an unrecognized state (ON_QA) and will not be moved to the MODIFIED state.

In response to this:

Bug 1798596: take into consideration all instance states for deletion

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.

@openshift-ci-robot
Copy link

@enxebre: Bugzilla bug 1798596 is in an unrecognized state (ON_QA) and will not be moved to the MODIFIED state.

In response to this:

Bug 1798596: take into consideration all instance states for deletion

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JoelSpeed JoelSpeed JoelSpeed left review comments

@bison bison Awaiting requested review from bison

@michaelgugino michaelgugino Awaiting requested review from michaelgugino

Assignees

@bison bison

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@enxebre @openshift-ci-robot @openshift-cherrypick-robot @JoelSpeed @bison @openshift-bot @openshift-merge-robot