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

Merge branch 'HLC' of https://github.com/ArangoDB/ArangoDB into HLC

This commit is contained in:
Max Neunhoeffer 2016-07-12 21:14:02 +00:00
parent 4c440337ba 985723e468
commit b3fbb1378f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arangod/Cluster/ClusterComm.cpp
View File

@ -25,6 +25,7 @@
#include "Logger/Logger.h" #include "Logger/Logger.h"
#include "Basics/ConditionLocker.h" #include "Basics/ConditionLocker.h"
#include "Basics/HybridLogicalClock.h"
#include "Basics/StringUtils.h" #include "Basics/StringUtils.h"
#include "Cluster/ClusterInfo.h" #include "Cluster/ClusterInfo.h"
#include "Cluster/ServerState.h" #include "Cluster/ServerState.h"
@ -316,6 +317,9 @@ OperationID ClusterComm::asyncRequest(
(*op->headerFields)["Authorization"] = (*op->headerFields)["Authorization"] =
ServerState::instance()->getAuthentication(); ServerState::instance()->getAuthentication();
} }
TRI_voc_tick_t timeStamp = TRI_HybridLogicalClock();
(*op->headerFields)["X-Arango-HLC"]
= arangodb::basics::HybridLogicalClock::encodeTimeStamp(timeStamp);
#ifdef DEBUG_CLUSTER_COMM #ifdef DEBUG_CLUSTER_COMM
#ifdef ARANGODB_ENABLE_MAINTAINER_MODE #ifdef ARANGODB_ENABLE_MAINTAINER_MODE
@ -444,6 +448,9 @@ std::unique_ptr<ClusterCommResult> ClusterComm::syncRequest(
client->keepConnectionOnDestruction(true); client->keepConnectionOnDestruction(true);
headersCopy["Authorization"] = ServerState::instance()->getAuthentication(); headersCopy["Authorization"] = ServerState::instance()->getAuthentication();
TRI_voc_tick_t timeStamp = TRI_HybridLogicalClock();
headersCopy["X-Arango-HLC"]
= arangodb::basics::HybridLogicalClock::encodeTimeStamp(timeStamp);
#ifdef DEBUG_CLUSTER_COMM #ifdef DEBUG_CLUSTER_COMM
#ifdef ARANGODB_ENABLE_MAINTAINER_MODE #ifdef ARANGODB_ENABLE_MAINTAINER_MODE
#if ARANGODB_ENABLE_BACKTRACE #if ARANGODB_ENABLE_BACKTRACE