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

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

This commit is contained in:
Michael Hackstein 2016-03-23 16:04:58 +01:00
parent 2d45a6e5b2 1d1c9b55dc
commit 2b82712803
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Cluster/ApplicationCluster.cpp
View File

@ -449,6 +449,10 @@ void ApplicationCluster::stop() {
} }
} }
while (_heartbeat->isRunning()) {
usleep(50000);
}
// ClusterComm::cleanup(); // ClusterComm::cleanup();
AgencyComm::cleanup(); AgencyComm::cleanup();
} }

4
arangod/Replication/ContinuousSyncer.cpp
View File

@ -909,7 +909,7 @@ int ContinuousSyncer::applyLog(SimpleHttpResult* response,
processedMarkers++; processedMarkers++;
std::shared_ptr<VPackBuilder> builder; auto builder = std::make_shared<VPackBuilder>();
try { try {
VPackParser parser(builder); VPackParser parser(builder);
@ -1242,7 +1242,7 @@ int ContinuousSyncer::fetchMasterState(std::string& errorMsg,
startTick = toTick; startTick = toTick;
} }
std::shared_ptr<VPackBuilder> builder; auto builder = std::make_shared<VPackBuilder>();
int res = parseResponse(builder, response.get()); int res = parseResponse(builder, response.get());
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {

14
arangod/Replication/InitialSyncer.cpp
View File

@ -228,7 +228,7 @@ int InitialSyncer::run(std::string& errorMsg, bool incremental) {
StringUtils::itoa(response->getHttpReturnCode()) + ": " + StringUtils::itoa(response->getHttpReturnCode()) + ": " +
response->getHttpReturnMessage(); response->getHttpReturnMessage();
} else { } else {
std::shared_ptr<VPackBuilder> builder; auto builder = std::make_shared<VPackBuilder>();
res = parseResponse(builder, response.get()); res = parseResponse(builder, response.get());
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
@ -346,7 +346,7 @@ int InitialSyncer::sendStartBatch(std::string& errorMsg) {
return TRI_ERROR_REPLICATION_MASTER_ERROR; return TRI_ERROR_REPLICATION_MASTER_ERROR;
} }
std::shared_ptr<VPackBuilder> builder; auto builder = std::make_shared<VPackBuilder>();
int res = parseResponse(builder, response.get()); int res = parseResponse(builder, response.get());
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
@ -495,7 +495,7 @@ int InitialSyncer::applyCollectionDump(
TRI_ASSERT(q <= end); TRI_ASSERT(q <= end);
std::shared_ptr<VPackBuilder> builder; auto builder = std::make_shared<VPackBuilder>();
try { try {
VPackParser parser(builder); VPackParser parser(builder);
@ -923,7 +923,7 @@ int InitialSyncer::handleCollectionSync(
this->sleep(static_cast<uint64_t>(sleepTime * 1000.0 * 1000.0)); this->sleep(static_cast<uint64_t>(sleepTime * 1000.0 * 1000.0));
} }
std::shared_ptr<VPackBuilder> builder; auto builder = std::make_shared<VPackBuilder>();
int res = parseResponse(builder, response.get()); int res = parseResponse(builder, response.get());
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
@ -1148,7 +1148,7 @@ int InitialSyncer::handleSyncKeys(TRI_vocbase_col_t* col,
return TRI_ERROR_REPLICATION_MASTER_ERROR; return TRI_ERROR_REPLICATION_MASTER_ERROR;
} }
std::shared_ptr<VPackBuilder> builder; auto builder = std::make_shared<VPackBuilder>();
int res = parseResponse(builder, response.get()); int res = parseResponse(builder, response.get());
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
@ -1350,7 +1350,7 @@ int InitialSyncer::handleSyncKeys(TRI_vocbase_col_t* col,
return TRI_ERROR_REPLICATION_MASTER_ERROR; return TRI_ERROR_REPLICATION_MASTER_ERROR;
} }
std::shared_ptr<VPackBuilder> builder; auto builder = std::make_shared<VPackBuilder>();
int res = parseResponse(builder, response.get()); int res = parseResponse(builder, response.get());
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
@ -1520,7 +1520,7 @@ int InitialSyncer::handleSyncKeys(TRI_vocbase_col_t* col,
return TRI_ERROR_REPLICATION_MASTER_ERROR; return TRI_ERROR_REPLICATION_MASTER_ERROR;
} }
std::shared_ptr<VPackBuilder> builder; auto builder = std::make_shared<VPackBuilder>();
int res = parseResponse(builder, response.get()); int res = parseResponse(builder, response.get());
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {

4
arangod/Replication/Syncer.cpp
View File

@ -206,7 +206,7 @@ int Syncer::sendCreateBarrier(std::string& errorMsg, TRI_voc_tick_t minTick) {
": HTTP " + StringUtils::itoa(response->getHttpReturnCode()) + ": HTTP " + StringUtils::itoa(response->getHttpReturnCode()) +
": " + response->getHttpReturnMessage(); ": " + response->getHttpReturnMessage();
} else { } else {
std::shared_ptr<VPackBuilder> builder; auto builder = std::make_shared<VPackBuilder>();
res = parseResponse(builder, response.get()); res = parseResponse(builder, response.get());
if (res == TRI_ERROR_NO_ERROR) { if (res == TRI_ERROR_NO_ERROR) {
@ -642,7 +642,7 @@ int Syncer::getMasterState(std::string& errorMsg) {
} }
std::shared_ptr<VPackBuilder> builder; auto builder = std::make_shared<VPackBuilder>();
int res = parseResponse(builder, response.get()); int res = parseResponse(builder, response.get());
if (res == TRI_ERROR_NO_ERROR) { if (res == TRI_ERROR_NO_ERROR) {