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-05-02 15:31:41 +02:00
parent 3248d6d574 3e470891f8
commit 6c9c0fca67
4 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arangod/Statistics/StatisticsAgent.h
View File

@ -373,6 +373,7 @@ class ConnectionStatisticsAgent
if (StatisticsFeature::enabled()) {
if (_statistics != nullptr) {
_statistics->_http = true;
TRI_HttpConnectionsStatistics.incCounter();
}
}
}

43
arangod/Statistics/statistics.cpp
View File

@ -35,7 +35,8 @@ using namespace arangodb;
using namespace arangodb::basics;
#ifdef USE_DEV_TIMERS
thread_local TRI_request_statistics_t* TRI_request_statistics_t::STATS = nullptr;
thread_local TRI_request_statistics_t* TRI_request_statistics_t::STATS =
nullptr;
#endif
static size_t const QUEUE_SIZE = 1000;
@ -79,15 +80,16 @@ static void ProcessRequestStatistics(TRI_request_statistics_t* statistics) {
TRI_MethodRequestsStatistics[(int)statistics->_requestType].incCounter();
// check that the request was completely received and transmitted
if (statistics->_readStart != 0.0 && (statistics->_async || statistics->_writeEnd != 0.0)) {
if (statistics->_readStart != 0.0 &&
(statistics->_async || statistics->_writeEnd != 0.0)) {
double totalTime;
if (statistics->_async) {
totalTime = statistics->_requestEnd - statistics->_readStart;
totalTime = statistics->_requestEnd - statistics->_readStart;
} else {
totalTime = statistics->_writeEnd - statistics->_readStart;
totalTime = statistics->_writeEnd - statistics->_readStart;
}
TRI_TotalTimeDistributionStatistics->addFigure(totalTime);
double requestTime = statistics->_requestEnd - statistics->_requestStart;
@ -112,15 +114,12 @@ static void ProcessRequestStatistics(TRI_request_statistics_t* statistics) {
#ifdef USE_DEV_TIMERS
LOG_TOPIC(INFO, Logger::REQUESTS)
<< "\"http-request-timing\",\""
<< statistics->_id << "\","
<< (statistics->_async ? "async" : "sync")
<< ",total(us)," << Logger::FIXED(totalTime)
<< ",io," << Logger::FIXED(ioTime)
<< ",queue," << Logger::FIXED(queueTime)
<< ",request," << Logger::FIXED(requestTime)
<< ",received," << statistics->_receivedBytes
<< ",sent," << statistics->_sentBytes;
<< "\"http-request-timing\",\"" << statistics->_id << "\","
<< (statistics->_async ? "async" : "sync") << ",total(us),"
<< Logger::FIXED(totalTime) << ",io," << Logger::FIXED(ioTime)
<< ",queue," << Logger::FIXED(queueTime) << ",request,"
<< Logger::FIXED(requestTime) << ",received,"
<< statistics->_receivedBytes << ",sent," << statistics->_sentBytes;
#endif
}
}
@ -265,16 +264,12 @@ void TRI_ReleaseConnectionStatistics(TRI_connection_statistics_t* statistics) {
MUTEX_LOCKER(mutexLocker, ConnectionDataLock);
if (statistics->_http) {
if (statistics->_connStart != 0.0) {
if (statistics->_connEnd == 0.0) {
TRI_HttpConnectionsStatistics.incCounter();
} else {
TRI_HttpConnectionsStatistics.decCounter();
TRI_HttpConnectionsStatistics.decCounter();
}
double totalTime = statistics->_connEnd - statistics->_connStart;
TRI_ConnectionTimeDistributionStatistics->addFigure(totalTime);
}
}
if (statistics->_connStart != 0.0 && statistics->_connEnd != 0.0) {
double totalTime = statistics->_connEnd - statistics->_connStart;
TRI_ConnectionTimeDistributionStatistics->addFigure(totalTime);
}
}

3
js/server/modules/@arangodb/cluster.js
View File

@ -1427,10 +1427,11 @@ var handlePlanChange = function () {
try {
cb.apply(null, args);
global.ArangoAgency.increaseVersion(lockInfo.part + "/Version");
global.ArangoAgency.unlockWrite(lockInfo.part, timeout);
let version = global.ArangoAgency.get(lockInfo.part + "/Version");
versions[lockInfo.part.toLowerCase()] = version[lockInfo.part + "/Version"];
global.ArangoAgency.unlockWrite(lockInfo.part, timeout);
}
catch (err) {
global.ArangoAgency.unlockWrite(lockInfo.part, timeout);

2
lib/SimpleHttpClient/SimpleHttpClient.cpp
View File

@ -41,7 +41,7 @@ namespace httpclient {
/// @brief empty map, used for headers
////////////////////////////////////////////////////////////////////////////////
std::unordered_map<std::string, std::string> const SimpleHttpClient::NO_HEADERS = {};
std::unordered_map<std::string, std::string> const SimpleHttpClient::NO_HEADERS {};
// -----------------------------------------------------------------------------
// constructors and destructors