Skip to content

Total order 28 #1042

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

Draft
tiagolobocastro wants to merge 2 commits into
base: release/2.8
Choose a base branch
from
Draft

Total order 28 #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
589e54d
refactor: simplify scheduling methods and a few fixes
tiagolobocastro Aug 14, 2025
c265cc5
fix: use sort unstable (not a fix)
tiagolobocastro Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 30 additions & 55 deletions control-plane/agents/src/bin/core/controller/scheduling/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ pub(crate) trait ResourceFilter: Sized {
}
fn sort<F: FnMut(&Self::Item, &Self::Item) -> std::cmp::Ordering>(mut self, sort: F) -> Self {
let data = self.data();
data.list.sort_by(sort);
data.list.sort_unstable_by(sort);
self
}
fn sort_ctx<F: FnMut(&Self::Request, &Self::Item, &Self::Item) -> std::cmp::Ordering>(
mut self,
mut sort: F,
) -> Self {
let data = self.data();
data.list.sort_by(|a, b| sort(&data.context, a, b));
data.list.sort_unstable_by(|a, b| sort(&data.context, a, b));
self
}
fn collect(self) -> Vec<Self::Item>;
Expand Down Expand Up @@ -185,16 +185,12 @@ impl ChildSorters {

let childa_is_local = !a.spec().share.shared();
let childb_is_local = !b.spec().share.shared();
if childa_is_local == childb_is_local {
match a.ag_replicas_on_pool().cmp(&b.ag_replicas_on_pool()) {
Ordering::Less => Ordering::Greater,
Ordering::Equal => Ordering::Equal,
Ordering::Greater => Ordering::Less,
match (childa_is_local, childb_is_local) {
(true, true) | (false, false) => {
b.ag_replicas_on_pool().cmp(&a.ag_replicas_on_pool())
}
} else if childa_is_local {
std::cmp::Ordering::Greater
} else {
std::cmp::Ordering::Less
(true, false) => Ordering::Greater,
(false, true) => Ordering::Less,
}
}
ord => ord,
Expand All @@ -204,53 +200,30 @@ impl ChildSorters {
}
// sort replicas by their health: prefer healthy replicas over unhealthy
fn sort_by_health(a: &ReplicaItem, b: &ReplicaItem) -> std::cmp::Ordering {
match a.child_info() {
None => {
match b.child_info() {
Some(b_info) if b_info.healthy => {
// sort replicas by their health: prefer healthy replicas over unhealthy
std::cmp::Ordering::Less
}
_ => std::cmp::Ordering::Equal,
}
}
Some(a_info) => match b.child_info() {
Some(b_info) if a_info.healthy && !b_info.healthy => std::cmp::Ordering::Greater,
Some(b_info) if !a_info.healthy && b_info.healthy => std::cmp::Ordering::Less,
_ => std::cmp::Ordering::Equal,
},
match (a.child_info(), b.child_info()) {
(None, None) => Ordering::Equal,
(None, Some(b)) if b.healthy => Ordering::Less,
(None, Some(_)) => Ordering::Equal,
(Some(a), None) if a.healthy => Ordering::Greater,
(Some(_), None) => Ordering::Equal,
(Some(a), Some(b)) => a.healthy.cmp(&b.healthy),
}
}
// remove unused replicas first
fn sort_by_child(a: &ReplicaItem, b: &ReplicaItem) -> std::cmp::Ordering {
match a.child_spec() {
None => {
match b.child_spec() {
None => std::cmp::Ordering::Equal,
Some(_) => {
// prefer the replica that is not part of a nexus
std::cmp::Ordering::Greater
}
}
}
Some(_) => {
match b.child_spec() {
// prefer the replica that is not part of a nexus
None => std::cmp::Ordering::Less,
// compare the child states, and then the rebuild progress
Some(_) => match (a.child_state(), b.child_state()) {
(Some(a_state), Some(b_state)) => {
match a_state.state.partial_cmp(&b_state.state) {
None => a_state.rebuild_progress.cmp(&b_state.rebuild_progress),
Some(ord) => ord,
}
}
(Some(_), None) => std::cmp::Ordering::Less,
(None, Some(_)) => std::cmp::Ordering::Greater,
(None, None) => std::cmp::Ordering::Equal,
},
}
}
match (a.child_spec(), b.child_spec()) {
(None, None) => Ordering::Equal,
(None, Some(_)) => Ordering::Less,
(Some(_), None) => Ordering::Greater,
(Some(_), Some(_)) => match (a.child_state(), b.child_state()) {
(Some(a_state), Some(b_state)) => match a_state.state.cmp(&b_state.state) {
Ordering::Equal => a_state.rebuild_progress.cmp(&b_state.rebuild_progress),
ord => ord,
},
(Some(_), None) => std::cmp::Ordering::Greater,
(None, Some(_)) => std::cmp::Ordering::Less,
(None, None) => std::cmp::Ordering::Equal,
},
}
}
}
Expand Down Expand Up @@ -353,6 +326,8 @@ impl AddReplicaSorters {
a: &ChildItem,
b: &ChildItem,
) -> std::cmp::Ordering {
// todo: preferring local to healthy children seems strange, though also why would we
// have healthy replicas not part of the nexus?
let a_is_local = a.state().node == request.nexus_spec().node;
let b_is_local = b.state().node == request.nexus_spec().node;
match (a_is_local, b_is_local) {
Expand All @@ -364,7 +339,7 @@ impl AddReplicaSorters {
match (a_healthy, b_healthy) {
(true, false) => std::cmp::Ordering::Less,
(false, true) => std::cmp::Ordering::Greater,
(_, _) => a.pool().free_space().cmp(&b.pool().free_space()),
(_, _) => b.pool().free_space().cmp(&a.pool().free_space()),
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion control-plane/agents/src/bin/core/controller/scheduling/volume_policy/simple.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ impl SimplePolicy {
)
}
/// Sort pools using weights between:
/// 1. number of replicas or number of replicas of a ag (N_REPL_WEIGHT %)
/// 1. number of replicas or number of replicas of an ag (N_REPL_WEIGHT %)
/// 2. free space (FREE_SPACE_WEIGHT %)
/// 3. overcommitment (OVER_COMMIT_WEIGHT %)
pub(crate) fn sort_by_weights(
Expand Down
37 changes: 21 additions & 16 deletions control-plane/stor-port/src/types/v0/transport/child.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,30 +99,35 @@ impl ChildState {
}
impl PartialOrd for ChildState {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
Some(self.cmp(other))
}
}
impl Ord for ChildState {
fn cmp(&self, other: &Self) -> Ordering {
match &self {
ChildState::Unknown => match &other {
ChildState::Unknown => Some(Ordering::Equal),
ChildState::Online => Some(Ordering::Less),
ChildState::Degraded => Some(Ordering::Less),
ChildState::Faulted => Some(Ordering::Greater),
ChildState::Unknown => Ordering::Equal,
ChildState::Online => Ordering::Less,
ChildState::Degraded => Ordering::Less,
ChildState::Faulted => Ordering::Greater,
},
ChildState::Online => match &other {
ChildState::Unknown => Some(Ordering::Greater),
ChildState::Online => Some(Ordering::Equal),
ChildState::Degraded => Some(Ordering::Greater),
ChildState::Faulted => Some(Ordering::Greater),
ChildState::Unknown => Ordering::Greater,
ChildState::Online => Ordering::Equal,
ChildState::Degraded => Ordering::Greater,
ChildState::Faulted => Ordering::Greater,
},
ChildState::Degraded => match &other {
ChildState::Unknown => Some(Ordering::Greater),
ChildState::Online => Some(Ordering::Less),
ChildState::Degraded => Some(Ordering::Equal),
ChildState::Faulted => Some(Ordering::Greater),
ChildState::Unknown => Ordering::Greater,
ChildState::Online => Ordering::Less,
ChildState::Degraded => Ordering::Equal,
ChildState::Faulted => Ordering::Greater,
},
ChildState::Faulted => match &other {
ChildState::Unknown => Some(Ordering::Less),
ChildState::Online => Some(Ordering::Less),
ChildState::Degraded => Some(Ordering::Less),
ChildState::Faulted => Some(Ordering::Equal),
ChildState::Unknown => Ordering::Less,
ChildState::Online => Ordering::Less,
ChildState::Degraded => Ordering::Less,
ChildState::Faulted => Ordering::Equal,
},
}
}
Expand Down