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

Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2016-12-23 12:11:58 +01:00
parent d37e887eb9 9a778c7304
commit 655a6d7c9b
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arangod/Cluster/HeartbeatThread.cpp
View File

@ -372,13 +372,23 @@ void HeartbeatThread::runCoordinator() {
AgencyCommManager::path("Shutdown"), AgencyCommManager::path("Shutdown"),
AgencyCommManager::path("Sync/Commands", _myId), AgencyCommManager::path("Sync/Commands", _myId),
AgencyCommManager::path("Sync/UserVersion"), AgencyCommManager::path("Sync/UserVersion"),
AgencyCommManager::path("Target/FailedServers")})); AgencyCommManager::path("Target/FailedServers"), "/.agency"}));
AgencyCommResult result = _agency.sendTransactionWithFailover(trx, 1.0); AgencyCommResult result = _agency.sendTransactionWithFailover(trx, 1.0);
if (!result.successful()) { if (!result.successful()) {
LOG_TOPIC(WARN, Logger::HEARTBEAT) LOG_TOPIC(WARN, Logger::HEARTBEAT)
<< "Heartbeat: Could not read from agency!"; << "Heartbeat: Could not read from agency!";
} else { } else {
VPackSlice agentPool =
result.slice()[0].get(
std::vector<std::string>({".agency","pool"}));
if (agentPool.isObject()) {
_agency.updateEndpoints(agentPool);
} else {
LOG(DEBUG) << "Cannot find an agency persisted in RAFT 8|";
}
VPackSlice shutdownSlice = result.slice()[0].get( VPackSlice shutdownSlice = result.slice()[0].get(
std::vector<std::string>({AgencyCommManager::path(), "Shutdown"})); std::vector<std::string>({AgencyCommManager::path(), "Shutdown"}));

1
scripts/startLocalCluster.sh
View File

@ -202,6 +202,7 @@ for aid in `seq 0 $(( $NRAGENTS - 1 ))`; do
--server.threads 16 \ --server.threads 16 \
--log.file cluster/$port.log \ --log.file cluster/$port.log \
--log.force-direct true \ --log.force-direct true \
--log.level agency=DEBUG \
$LOG_LEVEL_AGENCY \ $LOG_LEVEL_AGENCY \
$AUTHENTICATION \ $AUTHENTICATION \
$SSLKEYFILE \ $SSLKEYFILE \