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

Merge branch 'devel' of github.com:arangodb/arangodb into devel

This commit is contained in:
Andreas Streichardt 2016-06-10 19:28:23 +02:00
parent e086199fa6 dfa2d31410
commit 7a6c00506e
1 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
arangod/Agency/Supervision.cpp
View File

@ -74,6 +74,13 @@ std::vector<check_t> Supervision::checkDBServers() {
Node::Children const serversRegistered = Node::Children const serversRegistered =
_snapshot(currentServersRegisteredPrefix).children(); _snapshot(currentServersRegisteredPrefix).children();
std::vector<std::string> todelete;
for (auto const& machine : _snapshot(healthPrefix).children()) {
if (machine.first.substr(0,2) == "DB") {
todelete.push_back(machine.first);
}
}
for (auto const& machine : machinesPlanned) { for (auto const& machine : machinesPlanned) {
bool good = false; bool good = false;
@ -83,6 +90,9 @@ std::vector<check_t> Supervision::checkDBServers() {
serverID = machine.first; serverID = machine.first;
heartbeatTime = _snapshot(syncPrefix + serverID + "/time").toJson(); heartbeatTime = _snapshot(syncPrefix + serverID + "/time").toJson();
heartbeatStatus = _snapshot(syncPrefix + serverID + "/status").toJson(); heartbeatStatus = _snapshot(syncPrefix + serverID + "/status").toJson();
todelete.erase(
std::remove(todelete.begin(), todelete.end(), serverID), todelete.end());
try { // Existing try { // Existing
lastHeartbeatTime = lastHeartbeatTime =
@ -149,6 +159,20 @@ std::vector<check_t> Supervision::checkDBServers() {
} }
if (!todelete.empty()) {
query_t del = std::make_shared<Builder>();
del->openArray();
del->openArray();
del->openObject();
for (auto const& srv : todelete) {
del->add(_agencyPrefix + healthPrefix + srv, VPackValue(VPackValueType::Object));
del->add("op", VPackValue("delete"));
del->close();
}
del->close(); del->close(); del->close();
_agent->write(del);
}
return ret; return ret;
} }
@ -159,6 +183,14 @@ std::vector<check_t> Supervision::checkCoordinators() {
Node::Children const serversRegistered = Node::Children const serversRegistered =
_snapshot(currentServersRegisteredPrefix).children(); _snapshot(currentServersRegisteredPrefix).children();
std::vector<std::string> todelete;
for (auto const& machine : _snapshot(healthPrefix).children()) {
if (machine.first.substr(0,2) == "Co") {
todelete.push_back(machine.first);
}
}
for (auto const& machine : machinesPlanned) { for (auto const& machine : machinesPlanned) {
bool good = false; bool good = false;
@ -169,6 +201,9 @@ std::vector<check_t> Supervision::checkCoordinators() {
heartbeatTime = _snapshot(syncPrefix + serverID + "/time").toJson(); heartbeatTime = _snapshot(syncPrefix + serverID + "/time").toJson();
heartbeatStatus = _snapshot(syncPrefix + serverID + "/status").toJson(); heartbeatStatus = _snapshot(syncPrefix + serverID + "/status").toJson();
todelete.erase(
std::remove(todelete.begin(), todelete.end(), serverID), todelete.end());
try { // Existing try { // Existing
lastHeartbeatTime = lastHeartbeatTime =
_snapshot(healthPrefix + serverID + "/LastHeartbeatSent").toJson(); _snapshot(healthPrefix + serverID + "/LastHeartbeatSent").toJson();
@ -232,7 +267,22 @@ std::vector<check_t> Supervision::checkCoordinators() {
} }
if (!todelete.empty()) {
query_t del = std::make_shared<Builder>();
del->openArray();
del->openArray();
del->openObject();
for (auto const& srv : todelete) {
del->add(_agencyPrefix + healthPrefix + srv, VPackValue(VPackValueType::Object));
del->add("op", VPackValue("delete"));
del->close();
}
del->close(); del->close(); del->close();
_agent->write(del);
}
return ret; return ret;
} }
bool Supervision::updateSnapshot() { bool Supervision::updateSnapshot() {