Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing heartbeat agency update.

This commit is contained in:
lamai93 2019-11-13 14:33:33 +01:00
parent d2d0c2c5da
commit 6f64711db1
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arangod/Cluster/HeartbeatThread.cpp
View File

@ -1326,23 +1326,33 @@ bool HeartbeatThread::sendServerState() {
}
void HeartbeatThread::updateAgentPool(VPackSlice const& agentPool) {
if (agentPool.isObject() && agentPool.get("pool").isObject() &&
agentPool.hasKey("size") && agentPool.get("size").getUInt() > 0) {
if (agentPool.isObject() && agentPool.get("pool").isObject() && agentPool.hasKey("size") &&
agentPool.get("size").getUInt() > 0 && agentPool.get("id").isString()) {
try {
std::vector<std::string> values;
for (auto pair : VPackObjectIterator(agentPool.get("pool"))) {
values.emplace_back(pair.value.copyString());
// we have to make sure that the leader is on the front
auto leaderId = agentPool.get("id").stringRef();
auto pool = agentPool.get("pool");
values.reserve(pool.length());
values.emplace_back(pool.get(leaderId).copyString());
// now add all non leaders
for (auto pair : VPackObjectIterator(pool)) {
if (!pair.key.isEqualString(leaderId)) {
values.emplace_back(pair.value.copyString());
}
}
AgencyCommManager::MANAGER->updateEndpoints(values);
} catch (basics::Exception const& e) {
LOG_TOPIC(WARN, Logger::HEARTBEAT) << "Error updating agency pool: " << e.message();
LOG_TOPIC("1cec6", WARN, Logger::HEARTBEAT)
<< "Error updating agency pool: " << e.message();
} catch (std::exception const& e) {
LOG_TOPIC(WARN, Logger::HEARTBEAT) << "Error updating agency pool: " << e.what();
LOG_TOPIC("889d4", WARN, Logger::HEARTBEAT)
<< "Error updating agency pool: " << e.what();
} catch (...) {
}
} else {
LOG_TOPIC(ERR, Logger::AGENCYCOMM)
<< "Cannot find an agency persisted in RAFT 8|";
LOG_TOPIC("92522", ERR, Logger::AGENCYCOMM)
<< "Cannot find an agency persisted in RAFT 8|";
}
}