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

Track replica mode transition times with replicaTransitionTimeMap (backport #2685) #2695

Merged
merged 3 commits into from
Mar 30, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 12, 2024

This is an automatic backport of pull request #2685 done by Mergify.
Cherry-pick of 65bdc09 has failed:

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

You are currently cherry-picking commit 65bdc091.
  (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:   controller/volume_controller.go
	modified:   datastore/longhorn.go
	modified:   k8s/crds.yaml
	modified:   k8s/pkg/apis/longhorn/v1beta2/engine.go
	modified:   k8s/pkg/apis/longhorn/v1beta2/replica.go
	modified:   k8s/pkg/apis/longhorn/v1beta2/zz_generated.deepcopy.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   upgrade/v153to154/upgrade.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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Copy link
Author

mergify bot commented Mar 12, 2024

Cherry-pick of 65bdc09 has failed:

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

You are currently cherry-picking commit 65bdc091.
  (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:   controller/volume_controller.go
	modified:   datastore/longhorn.go
	modified:   k8s/crds.yaml
	modified:   k8s/pkg/apis/longhorn/v1beta2/engine.go
	modified:   k8s/pkg/apis/longhorn/v1beta2/replica.go
	modified:   k8s/pkg/apis/longhorn/v1beta2/zz_generated.deepcopy.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   upgrade/v153to154/upgrade.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

Use this engine status field  to avoid frequent updates to the replica
lastHealthyAt field.

Longhorn 8114

Signed-off-by: Eric Weber <eric.weber@suse.com>
(cherry picked from commit 65bdc09)
Longhorn 8114

Signed-off-by: Eric Weber <eric.weber@suse.com>
(cherry picked from commit 93868b4)
@ejweber ejweber force-pushed the mergify/bp/v1.5.x/pr-2685 branch 2 times, most recently from 5084daa to 9a7261c Compare March 29, 2024 18:29
Longhorn 8114

Signed-off-by: Eric Weber <eric.weber@suse.com>
(cherry picked from commit 686f4e2)
@ejweber ejweber removed the conflicts label Mar 29, 2024
@ejweber ejweber marked this pull request as ready for review March 29, 2024 18:59
@innobead innobead merged commit cbc2203 into v1.5.x Mar 30, 2024
5 checks passed
@innobead innobead deleted the mergify/bp/v1.5.x/pr-2685 branch March 30, 2024 13:41
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