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

fix: attempt to delete processes from instance-managers in unknown state (backport #3127) #3155

Merged
merged 3 commits into from
Sep 11, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 11, 2024

Which issue(s) this PR fixes:

longhorn/longhorn#6552

What this PR does / why we need it:

See longhorn/longhorn#6552 (comment) for context. It may be possible to delete engine and replica processes from an instance-manager even when the instance-manager's state is unknown. Doing so prevents the processes from becoming orphans if the instance-manager eventually recovers from the unknown state.

This PR is looking good in some local testing, but I want to put it through a few more paces before review.


This is an automatic backport of pull request #3127 done by Mergify.

@mergify mergify bot requested a review from a team as a code owner September 11, 2024 15:12
@mergify mergify bot added the conflicts label Sep 11, 2024
Copy link
Author

mergify bot commented Sep 11, 2024

Cherry-pick of 8629fd7 has failed:

On branch mergify/bp/v1.5.x/pr-3127
Your branch is up to date with 'origin/v1.5.x'.

You are currently cherry-picking commit 8629fd72.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller/engine_controller.go

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 72e2445 has failed:

On branch mergify/bp/v1.5.x/pr-3127
Your branch is ahead of 'origin/v1.5.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 72e24457.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   controller/engine_controller.go
	modified:   engineapi/instance_manager.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller/instance_manager_controller.go
	both modified:   controller/replica_controller.go

Cherry-pick of 1a1ab36 has failed:

On branch mergify/bp/v1.5.x/pr-3127
Your branch is ahead of 'origin/v1.5.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1a1ab369.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller/replica_controller.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Longhorn 6552

Signed-off-by: Eric Weber <eric.weber@suse.com>
(cherry picked from commit 8629fd7)
Longhorn 6552

Signed-off-by: Eric Weber <eric.weber@suse.com>
(cherry picked from commit 72e2445)
Longhorn 6552

Signed-off-by: Eric Weber <eric.weber@suse.com>
(cherry picked from commit 1a1ab36)
@derekbit derekbit merged commit 3dde300 into v1.5.x Sep 11, 2024
7 checks passed
@derekbit derekbit deleted the mergify/bp/v1.5.x/pr-3127 branch September 11, 2024 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants