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

Automatically evict replicas while draining #2138

Merged
merged 5 commits into from
Nov 23, 2023

Conversation

ejweber
Copy link
Contributor

@ejweber ejweber commented Sep 6, 2023

longhorn/longhorn#2238

The LEP at longhorn/longhorn#6643 is largely finalized and this PR is ready for review based on the latest language there.

@ejweber
Copy link
Contributor Author

ejweber commented Nov 1, 2023

TODO:

  • Squash changes before merge (this one got a bit messy).

james-munson
james-munson previously approved these changes Nov 7, 2023
Copy link
Contributor

@james-munson james-munson left a comment

Choose a reason for hiding this comment

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

I would probably not catch errors of omission, but the changes look good to me.

@innobead
Copy link
Member

@ejweber Please fix the conflict.

Copy link

mergify bot commented Nov 20, 2023

This pull request is now in conflicts. Could you fix it @ejweber? 🙏

Longhorn 2238

Signed-off-by: Eric Weber <eric.weber@suse.com>
Longhorn 2238

Signed-off-by: Eric Weber <eric.weber@suse.com>
Longhorn 2238

Signed-off-by: Eric Weber <eric.weber@suse.com>
@ejweber
Copy link
Contributor Author

ejweber commented Nov 20, 2023

I did the following to keep this PR ready for merge:

  1. Squash everything it originally contained (things were quite messy).
  2. Merge in master.
  3. Add a new commit that makes one of my new DataStore functions read-only (in the spirit of the merged changes).

Copy link
Contributor

@PhanLe1010 PhanLe1010 left a comment

Choose a reason for hiding this comment

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

In general LGTM

controller/node_controller.go Outdated Show resolved Hide resolved
controller/node_controller.go Outdated Show resolved Hide resolved
Longhorn 2238

Signed-off-by: Eric Weber <eric.weber@suse.com>
Copy link
Member

@innobead innobead left a comment

Choose a reason for hiding this comment

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

In general, LGTM.

@innobead innobead enabled auto-merge (rebase) November 23, 2023 15:31
auto-merge was automatically disabled November 23, 2023 15:40

Rebase failed

@innobead innobead merged commit dd66388 into longhorn:master Nov 23, 2023
5 checks passed
@ejweber
Copy link
Contributor Author

ejweber commented Jan 11, 2024

@mergify backport v1.5.x

Copy link

mergify bot commented Jan 11, 2024

backport v1.5.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jan 11, 2024
Co-authored-by: David Ko <dko@suse.com>
(cherry picked from commit dd66388)

# Conflicts:
#	scheduler/replica_scheduler.go
#	scheduler/replica_scheduler_test.go
#	upgrade/v151to152/upgrade.go
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.

4 participants