diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp index 7292578654..491bbf9209 100644 --- a/fdbserver/ClusterController.actor.cpp +++ b/fdbserver/ClusterController.actor.cpp @@ -1766,6 +1766,10 @@ ACTOR Future timeKeeper(ClusterControllerData *self) { loop { try { if(!g_network->isSimulated()) { + // This is done to provide an arbitrary logged transaction every ~10s. + // FIXME: replace or augment this with logging on the proxy which tracks + // how long it is taking to hear responses from each other component. + UID debugID = g_random->randomUniqueID(); TraceEvent("TimeKeeperCommit", debugID); tr->debugTransaction(debugID); diff --git a/fdbserver/LogSystemPeekCursor.actor.cpp b/fdbserver/LogSystemPeekCursor.actor.cpp index f33202635c..d19856f4aa 100644 --- a/fdbserver/LogSystemPeekCursor.actor.cpp +++ b/fdbserver/LogSystemPeekCursor.actor.cpp @@ -849,7 +849,7 @@ void ILogSystem::MultiCursor::advanceTo(LogMessageVersion n) { } Future ILogSystem::MultiCursor::getMore(int taskID) { - auto startVersion = cursors.back()->version(); + LogMessageVersion startVersion = cursors.back()->version(); while( cursors.size() > 1 && cursors.back()->version() >= epochEnds.back() ) { poppedVersion = std::max(poppedVersion, cursors.back()->popped()); cursors.pop_back();