1
0
Fork 0

MORE Debug logging

This commit is contained in:
Michael Hackstein 2019-07-08 13:07:54 +02:00
parent 06aabcdfe1
commit 80160bdf3b
1 changed files with 16 additions and 12 deletions

View File

@ -21,6 +21,7 @@
/// @author Simon Grätzer
////////////////////////////////////////////////////////////////////////////////
#include "RocksDBEngine/RocksDBWalAccess.h"
#include "Basics/StaticStrings.h"
#include "Replication/TailingSyncer.h"
#include "RestServer/DatabaseFeature.h"
@ -29,7 +30,6 @@
#include "RocksDBEngine/RocksDBLogValue.h"
#include "RocksDBEngine/RocksDBReplicationTailing.h"
#include "RocksDBEngine/RocksDBTypes.h"
#include "RocksDBEngine/RocksDBWalAccess.h"
#include "Utils/DatabaseGuard.h"
#include "VocBase/LogicalCollection.h"
#include "VocBase/LogicalView.h"
@ -100,8 +100,7 @@ class MyWALDumper final : public rocksdb::WriteBatch::Handler, public WalAccessC
public:
MyWALDumper(WalAccess::Filter const& filter,
WalAccess::MarkerCallback const& f,
size_t maxResponseSize)
WalAccess::MarkerCallback const& f, size_t maxResponseSize)
: WalAccessContext(filter, f),
_definitionsCF(RocksDBColumnFamily::definitions()->GetID()),
_documentsCF(RocksDBColumnFamily::documents()->GetID()),
@ -298,7 +297,8 @@ class MyWALDumper final : public rocksdb::WriteBatch::Handler, public WalAccessC
TRI_vocbase_t* vocbase = loadVocbase(dbid);
if (vocbase != nullptr) {
{ // tick number
arangodb::velocypack::StringRef uuid = RocksDBLogValue::collectionUUID(blob);
arangodb::velocypack::StringRef uuid =
RocksDBLogValue::collectionUUID(blob);
TRI_ASSERT(!uuid.empty());
uint64_t tick = _currentSequence + (_startOfBatch ? 0 : 1);
VPackObjectBuilder marker(&_builder, true);
@ -697,7 +697,6 @@ class MyWALDumper final : public rocksdb::WriteBatch::Handler, public WalAccessC
#endif
private:
void writeCommitMarker(TRI_voc_tick_t dbid) {
TRI_ASSERT(_state == TRANSACTION);
TRI_vocbase_t* vocbase = loadVocbase(dbid);
@ -774,8 +773,8 @@ class MyWALDumper final : public rocksdb::WriteBatch::Handler, public WalAccessC
// iterates over WAL starting at 'from' and returns up to 'chunkSize' documents
// from the corresponding database
WalAccessResult RocksDBWalAccess::tail(Filter const& filter, size_t chunkSize,
TRI_voc_tick_t,
MarkerCallback const& func) const {
TRI_voc_tick_t, MarkerCallback const& func) const {
auto startTime = TRI_microtime();
TRI_ASSERT(filter.transactionIds.empty()); // not supported in any way
rocksdb::TransactionDB* db = rocksutils::globalRocksDB();
@ -815,6 +814,8 @@ WalAccessResult RocksDBWalAccess::tail(Filter const& filter, size_t chunkSize,
LOG_TOPIC("caefa", DEBUG, Logger::ENGINES)
<< "WAL tailing call. Scan since: " << since << ", tick start: " << filter.tickStart
<< ", tick end: " << filter.tickEnd << ", chunk size: " << chunkSize;
LOG_TOPIC("katze", ERR, Logger::REPLICATION)
<< "Updates since took: " << TRI_microtime() - startTime;
while (iterator->Valid() && lastScannedTick <= filter.tickEnd) {
rocksdb::BatchResult batch = iterator->GetBatch();
// record the first tick we are actually considering
@ -845,7 +846,8 @@ WalAccessResult RocksDBWalAccess::tail(Filter const& filter, size_t chunkSize,
}
#endif
if (!s.ok()) {
LOG_TOPIC("57d54", ERR, Logger::REPLICATION) << "error during WAL scan: " << s.ToString();
LOG_TOPIC("57d54", ERR, Logger::REPLICATION)
<< "error during WAL scan: " << s.ToString();
break; // s is considered in the end
}
@ -871,8 +873,10 @@ WalAccessResult RocksDBWalAccess::tail(Filter const& filter, size_t chunkSize,
if (!s.ok()) {
result.reset(convertStatus(s, rocksutils::StatusHint::wal));
}
// LOG_TOPIC("f7ab7", WARN, Logger::REPLICATION) << "2. firstTick: " << firstTick << "
// lastWrittenTick: " << lastWrittenTick
LOG_TOPIC("katze", ERR, Logger::REPLICATION)
<< "Full wal scan took: " << TRI_microtime() - startTime;
// LOG_TOPIC("f7ab7", WARN, Logger::REPLICATION) << "2. firstTick: " <<
// firstTick << " lastWrittenTick: " << lastWrittenTick
// << " latestTick: " << latestTick;
return result;
}