Skip to content

fix bug: switching the slots and bumping the configEpoch must be executed within the same mutex lock. #452

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
takenliu merged 1 commit into from
May 28, 2026
Merged

fix bug: switching the slots and bumping the configEpoch must be executed within the same mutex lock. #452

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
36 changes: 23 additions & 13 deletions src/tendisplus/cluster/cluster_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,8 @@ void ClusterNode::setSession(std::shared_ptr<ClusterSession> sess) {
INVARIANT_D(!_nodeSession);
_nodeSession = sess;
if (sess) {
LOG(INFO) << "ClusterNode setSession," << " node name:" << _nodeName
LOG(INFO) << "ClusterNode setSession,"
<< " node name:" << _nodeName
<< " node addr:" << sess->getRemoteRepr()
<< " session id:" << sess->id();
} else {
Expand Down Expand Up @@ -1220,14 +1221,18 @@ Status ClusterState::setSlots(CNodePtr n,
}
++idx;
}
// NOTE(takenliu): switching the slots and bumping the configEpoch
// must be executed within the same mutex lock.
if (n == getMyselfNode()) {
Status s = clusterBumpConfigEpochWithoutConsensus();
if (!s.ok()) {
LOG(ERROR) << "setSlots BumpConfigEpoch fail";
return s;
}
}
}

if (n == getMyselfNode()) {
Status s = clusterBumpConfigEpochWithoutConsensus();
if (!s.ok()) {
LOG(ERROR) << "setSlots BumpConfigEpoch fail";
return s;
}
// NOTE(wayenchen) broadcast gossip message if meta change finished
uint64_t offset = _server->getReplManager()->replicationGetOffset();
clusterBroadcastPong(CLUSTER_BROADCAST_ALL, offset);
Expand Down Expand Up @@ -1302,8 +1307,10 @@ Expected<CNodePtr> ClusterState::clusterHandleRedirect(uint32_t slot,

if (node != _myself) {
std::stringstream ss;
ss << "-" << "MOVED" << " " << slot << " " << node->getNodeIp() << ":"
<< node->getPort() << "\r\n";
ss << "-"
<< "MOVED"
<< " " << slot << " " << node->getNodeIp() << ":" << node->getPort()
<< "\r\n";
return {ErrorCodes::ERR_MOVED, ss.str()};
}
return node;
Expand Down Expand Up @@ -1512,7 +1519,8 @@ Expected<std::string> ClusterState::getNodeInfo(CNodePtr n) {
if (emigrStr.ok()) {
stream << "migrateSlots:" << emigrStr.value() << "\n";
} else {
stream << "migrateSlots:null" << "\n";
stream << "migrateSlots:null"
<< "\n";
}
}
stream << "flag:" << flags << "\n"
Expand Down Expand Up @@ -1911,8 +1919,9 @@ Status ClusterState::clusterSetMaster(CNodePtr node,
}

LOG(INFO) << "replication set node:" << node->getNodeName()
<< " as my master," << "ip:" << node->getNodeIp()
<< " port:" << node->getPort() << ",ignoreRepl:" << ignoreRepl;
<< " as my master,"
<< "ip:" << node->getNodeIp() << " port:" << node->getPort()
<< ",ignoreRepl:" << ignoreRepl;

resetManualFailover();
_server->CloseAllChannel();
Expand Down Expand Up @@ -4406,8 +4415,9 @@ Status ClusterManager::startup() {
auto name = _clusterState->getMyselfNode()->getNodeName();
auto state = _clusterState->getClusterState();
std::string clusterState = (unsigned(state) > 0) ? "OK" : "FAIL";
LOG(INFO) << "cluster init success:" << " myself node name " << name
<< " cluster state is " << clusterState;
LOG(INFO) << "cluster init success:"
<< " myself node name " << name << " cluster state is "
<< clusterState;
}

std::shared_ptr<ServerParams> params = _svr->getParams();
Expand Down
Loading