addressed review comments

This commit is contained in:
Evan Tschannen 2018-11-04 20:26:23 -08:00
parent bd60027544
commit c1bd279a4e
2 changed files with 5 additions and 1 deletions

View File

@ -1766,6 +1766,10 @@ ACTOR Future<Void> 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);

View File

@ -849,7 +849,7 @@ void ILogSystem::MultiCursor::advanceTo(LogMessageVersion n) {
}
Future<Void> 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();