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(manager): fix logic for when RWX workload is restarted after node… (backport #3077) #3169

Merged
merged 1 commit into from
Sep 18, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 18, 2024

… failure

Which issue(s) this PR fixes:

longhorn/longhorn#9290

What this PR does / why we need it:

Special notes for your reviewer:

Additional documentation or context


This is an automatic backport of pull request #3077 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Sep 18, 2024
Copy link
Author

mergify bot commented Sep 18, 2024

Cherry-pick of a376849 has failed:

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

You are currently cherry-picking commit a3768493.
  (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/kubernetes_pod_controller.go
	modified:   controller/share_manager_controller.go
	modified:   controller/volume_controller.go

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

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

… failure

Signed-off-by: James Munson <james.munson@suse.com>
(cherry picked from commit a376849)

# Conflicts:
#	datastore/longhorn.go
@mergify mergify bot merged commit 05a106e into v1.7.x Sep 18, 2024
5 checks passed
@mergify mergify bot deleted the mergify/bp/v1.7.x/pr-3077 branch September 18, 2024 23:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants