Skip to content

refactor: consolidate cluster slot checks in connection.rs #73

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

Merged
kacy merged 1 commit into from
Feb 10, 2026
Merged

refactor: consolidate cluster slot checks in connection.rs #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 7 additions & 22 deletions crates/ember-server/src/cluster.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,10 @@ impl ClusterCoordinator {
// validate: all slots must be unassigned
for &slot in slots {
if slot >= SLOT_COUNT {
return Frame::Error(format!(
"ERR Invalid or out of range slot {slot}"
));
return Frame::Error(format!("ERR Invalid or out of range slot {slot}"));
}
if state.slot_map.owner(slot).is_some() {
return Frame::Error(format!(
"ERR Slot {slot} is already busy"
));
return Frame::Error(format!("ERR Slot {slot} is already busy"));
}
}

Expand All @@ -210,20 +206,14 @@ impl ClusterCoordinator {
// validate: all slots must be owned by us
for &slot in slots {
if slot >= SLOT_COUNT {
return Frame::Error(format!(
"ERR Invalid or out of range slot {slot}"
));
return Frame::Error(format!("ERR Invalid or out of range slot {slot}"));
}
match state.slot_map.owner(slot) {
Some(owner) if owner != self.local_id => {
return Frame::Error(format!(
"ERR Slot {slot} is not owned by this node"
));
return Frame::Error(format!("ERR Slot {slot} is not owned by this node"));
}
None => {
return Frame::Error(format!(
"ERR Slot {slot} is already unassigned"
));
return Frame::Error(format!("ERR Slot {slot} is already unassigned"));
}
_ => {}
}
Expand Down Expand Up @@ -277,13 +267,8 @@ impl ClusterCoordinator {
}

match state.slot_owner(slot) {
Some(owner) => Some(Frame::Error(format!(
"MOVED {} {}",
slot, owner.addr
))),
None => Some(Frame::Error(
"CLUSTERDOWN Hash slot not served".into(),
)),
Some(owner) => Some(Frame::Error(format!("MOVED {} {}", slot, owner.addr))),
None => Some(Frame::Error("CLUSTERDOWN Hash slot not served".into())),
}
}

Expand Down
Loading