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

allow synchronous replication without returning the documents from the followers (#5691)

This commit is contained in:
Jan 2018-06-27 11:37:32 +02:00 committed by GitHub
parent 47db35af98
commit e99952206d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arangod/Transaction/Methods.cpp
View File

@ -1549,7 +1549,7 @@ OperationResult transaction::Methods::insert(std::string const& collectionName,
if (_state->isCoordinator()) {
return insertCoordinator(collectionName, value, optionsCopy);
}
if (_state->isDBServer()) {
if (_state->isDBServer() && !optionsCopy.isSynchronousReplicationFrom.empty()) {
optionsCopy.silent = false;
}
@ -1734,7 +1734,8 @@ OperationResult transaction::Methods::insertLocal(
std::string path =
"/_db/" + arangodb::basics::StringUtils::urlEncode(vocbase().name()) +
"/_api/document/" + arangodb::basics::StringUtils::urlEncode(collection->name()) +
"?isRestore=true&isSynchronousReplication=" + ServerState::instance()->getId();
"?isRestore=true&isSynchronousReplication=" + ServerState::instance()->getId() +
"&" + StaticStrings::SilentString + "=true" +
"&" + StaticStrings::OverWrite + "=" + (options.overwrite ? "true" : "false");
VPackBuilder payload;
@ -1857,7 +1858,7 @@ OperationResult transaction::Methods::update(std::string const& collectionName,
if (_state->isCoordinator()) {
return updateCoordinator(collectionName, newValue, optionsCopy);
}
if (_state->isDBServer()) {
if (_state->isDBServer() && !optionsCopy.isSynchronousReplicationFrom.empty()) {
optionsCopy.silent = false;
}
@ -1918,7 +1919,7 @@ OperationResult transaction::Methods::replace(std::string const& collectionName,
if (_state->isCoordinator()) {
return replaceCoordinator(collectionName, newValue, optionsCopy);
}
if (_state->isDBServer()) {
if (_state->isDBServer() && !optionsCopy.isSynchronousReplicationFrom.empty()) {
optionsCopy.silent = false;
}
@ -2107,7 +2108,7 @@ OperationResult transaction::Methods::modifyLocal(
"/_api/document/" +
arangodb::basics::StringUtils::urlEncode(collection->name()) +
"?isRestore=true&isSynchronousReplication=" +
ServerState::instance()->getId();
ServerState::instance()->getId() + "&" + StaticStrings::SilentString + "=true";
VPackBuilder payload;
@ -2230,7 +2231,7 @@ OperationResult transaction::Methods::remove(std::string const& collectionName,
if (_state->isCoordinator()) {
return removeCoordinator(collectionName, value, optionsCopy);
}
if (_state->isDBServer()) {
if (_state->isDBServer() && !optionsCopy.isSynchronousReplicationFrom.empty()) {
optionsCopy.silent = false;
}
@ -2398,7 +2399,7 @@ OperationResult transaction::Methods::removeLocal(
"/_api/document/" +
arangodb::basics::StringUtils::urlEncode(collection->name()) +
"?isRestore=true&isSynchronousReplication=" +
ServerState::instance()->getId();
ServerState::instance()->getId() + "&" + StaticStrings::SilentString + "=true";
VPackBuilder payload;
@ -2669,10 +2670,7 @@ OperationResult transaction::Methods::truncateLocal(
}
size_t nrDone = 0;
// TODO: is TRX_FOLLOWER_TIMEOUT actually appropriate here? truncate
// can be a much more expensive operation than a single document
// insert/update/remove...
size_t nrGood = cc->performRequests(requests, TRX_FOLLOWER_TIMEOUT,
size_t nrGood = cc->performRequests(requests, 120.0,
nrDone, Logger::REPLICATION, false);
if (nrGood < followers->size()) {
// If any would-be-follower refused to follow there must be a

2
arangod/Transaction/Methods.h
View File

@ -128,8 +128,6 @@ class Methods {
using VPackBuilder = arangodb::velocypack::Builder;
using VPackSlice = arangodb::velocypack::Slice;
double const TRX_FOLLOWER_TIMEOUT = 3.0;
/// @brief transaction::Methods
private:
Methods() = delete;