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

some minor warnings

This commit is contained in:
Kaveh Vahedipour 2016-11-29 13:13:25 +01:00
parent c775b92d7d
commit 7587053ffc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Agency/AgencyComm.cpp
View File

@ -65,7 +65,7 @@ const std::vector<std::string> AgencyTransaction::TypeUrl(
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
AgencyPrecondition::AgencyPrecondition() AgencyPrecondition::AgencyPrecondition()
: type(AgencyPrecondition::Type::NONE) {} : type(AgencyPrecondition::Type::NONE), empty(true) {}
AgencyPrecondition::AgencyPrecondition(std::string const& key, Type t, bool e) AgencyPrecondition::AgencyPrecondition(std::string const& key, Type t, bool e)
: key(AgencyCommManager::path(key)), type(t), empty(e) {} : key(AgencyCommManager::path(key)), type(t), empty(e) {}

4
arangod/Agency/Inception.cpp
View File

@ -239,8 +239,6 @@ bool Inception::restartingActiveAgent() {
auto s = std::chrono::system_clock::now(); auto s = std::chrono::system_clock::now();
std::chrono::seconds timeout(60); std::chrono::seconds timeout(60);
long waitInterval(500000);
// Can only be done responcibly, if we are complete // Can only be done responcibly, if we are complete
if (myConfig.poolComplete()) { if (myConfig.poolComplete()) {
@ -249,6 +247,8 @@ bool Inception::restartingActiveAgent() {
CONDITION_LOCKER(guard, _cv); CONDITION_LOCKER(guard, _cv);
long waitInterval(500000);
while (!this->isStopping() && !_agent->isStopping()) { while (!this->isStopping() && !_agent->isStopping()) {
active.erase( active.erase(