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

removing debug warnings

This commit is contained in:
Kaveh Vahedipour 2016-08-05 14:41:24 +02:00
parent 770d8777a2
commit fcf96f42a7
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arangod/Agency/State.cpp
View File

@ -201,14 +201,10 @@ size_t State::removeConflicts (query_t const& transactions) {
idx = slice.get("index").getUInt(); idx = slice.get("index").getUInt();
pos = idx-_cur; pos = idx-_cur;
LOG(WARN) << __LINE__;
if (pos < _log.size()) { if (pos < _log.size()) {
if (idx == _log.at(pos).index && trm != _log.at(pos).term) { if (idx == _log.at(pos).index && trm != _log.at(pos).term) {
LOG(WARN) << __LINE__;
LOG_TOPIC(DEBUG, Logger::AGENCY) LOG_TOPIC(DEBUG, Logger::AGENCY)
<< "Removing " << _log.size()-pos << "Removing " << _log.size()-pos
<< " entries from log starting with " << idx << "==" << " entries from log starting with " << idx << "=="
@ -219,38 +215,29 @@ size_t State::removeConflicts (query_t const& transactions) {
aql << "FOR l IN log FILTER l._key >= '" << stringify(idx) aql << "FOR l IN log FILTER l._key >= '" << stringify(idx)
<< "' REMOVE l IN log"; << "' REMOVE l IN log";
LOG(WARN) << __LINE__;
arangodb::aql::Query arangodb::aql::Query
query(false, _vocbase, aql.str().c_str(), aql.str().size(), query(false, _vocbase, aql.str().c_str(), aql.str().size(),
bindVars, nullptr, arangodb::aql::PART_MAIN); bindVars, nullptr, arangodb::aql::PART_MAIN);
LOG(WARN) << __LINE__;
auto queryResult = query.execute(_queryRegistry); auto queryResult = query.execute(_queryRegistry);
LOG(WARN) << __LINE__;
if (queryResult.code != TRI_ERROR_NO_ERROR) { if (queryResult.code != TRI_ERROR_NO_ERROR) {
THROW_ARANGO_EXCEPTION_MESSAGE( THROW_ARANGO_EXCEPTION_MESSAGE(
queryResult.code, queryResult.details); queryResult.code, queryResult.details);
} }
LOG(WARN) << __LINE__;
queryResult.result->slice(); queryResult.result->slice();
LOG(WARN) << __LINE__;
// volatile logs // volatile logs
{ {
MUTEX_LOCKER(mutexLocker, _logLock); MUTEX_LOCKER(mutexLocker, _logLock);
_log.erase(_log.begin()+pos, _log.end()); _log.erase(_log.begin()+pos, _log.end());
} }
LOG(WARN) << __LINE__;
break; break;
} else { } else {
LOG(WARN) << _log.at(pos);
LOG(WARN) << slice.toJson();
++ndups; ++ndups;
} }
} }

2
scripts/startStandAloneAgency.sh
View File

@ -25,7 +25,7 @@ SFRE=2.5
COMP=1000 COMP=1000
BASE=5001 BASE=5001
#rm -rf agency rm -rf agency
mkdir -p agency mkdir -p agency
echo -n "Starting agency ... " echo -n "Starting agency ... "
if [ $NRAGENTS -gt 1 ]; then if [ $NRAGENTS -gt 1 ]; then