Skip to content

chore: refresh hash ring more eagerly #47

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
leiysky merged 1 commit into from
Apr 22, 2025
Merged

chore: refresh hash ring more eagerly #47

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
21 changes: 18 additions & 3 deletions crates/cluster/src/gossip.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const DEFAULT_SYNC_INTERVAL: Duration = Duration::from_secs(5);
const DEFAULT_RETRY_INTERVAL: Duration = Duration::from_secs(1);
const DEFAULT_RETRIES: usize = 3;

const DEFAULT_REBUILD_RING_INTERVAL: Duration = Duration::from_secs(10);
const DEFAULT_REBUILD_RING_INTERVAL: Duration = Duration::from_secs(5);

const DEFAULT_MEMBER_DEADLINE: Duration = Duration::from_secs(30);

Expand Down Expand Up @@ -329,9 +329,16 @@ impl GossipState {
}

fn rebuild_ring(&self) {
let members = self.membership.read().unwrap();
// Ensure the current node is alive
let mut membership = self.membership.write().unwrap();
membership.update_member(MemberState {
info: self.current(),
status: MemberStatus::Alive,
heartbeat: Timestamp::now(),
});

*self.ring.write().unwrap() = Arc::new(HashRing::from(members.members().keys().cloned()));
*self.ring.write().unwrap() =
Arc::new(HashRing::from(membership.members().keys().cloned()));
}

fn mark_dead(&self, peer: &NodeInfo) {
Expand Down Expand Up @@ -429,6 +436,10 @@ async fn drive_gossip(state: Arc<GossipState>, runtime: &Runtime) -> Result<(),
.iter()
.nth(random::<usize>() % membership.members().len())
{
if member.status == MemberStatus::Dead {
log::debug!("skipping dead member: {member:?}");
continue;
}
log::debug!("pinging member: {member:?}");
state.ping(member.info.clone()).await;
} else {
Expand All @@ -452,6 +463,10 @@ async fn drive_gossip(state: Arc<GossipState>, runtime: &Runtime) -> Result<(),
.iter()
.nth(random::<usize>() % membership.members().len())
{
if member.status == MemberStatus::Dead {
log::debug!("skipping dead member: {member:?}");
continue;
}
log::debug!("syncing member: {member:?}");
state.sync(member.info.clone()).await;
} else {
Expand Down
6 changes: 6 additions & 0 deletions crates/cluster/src/member.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ impl Membership {
Entry::Occupied(mut entry) => {
let current = entry.get_mut();
if current.info.incarnation < member.info.incarnation {
log::info!(target: "gossip", "advancing member incarnation from [{}] to [{}]: {member:?}", current.info.incarnation, member.info.incarnation);
*current = member;
return;
}
Expand All @@ -76,15 +77,20 @@ impl Membership {
}
// If the incarnation is the same, we only accept downgrades
current.status.downgrade_to(&member.status);
if member.status == MemberStatus::Dead {
log::info!(target: "gossip", "member confirmed dead: {member:?}");
}
current.heartbeat = current.heartbeat.max(member.heartbeat);
}
Entry::Vacant(entry) => {
log::info!(target: "gossip", "adding new member: {member:?}");
entry.insert(member);
}
}
}

pub fn remove_member(&mut self, id: Uuid) {
log::info!(target: "gossip", "removing member: {id}");
self.members.remove(&id);
}
}
Loading