Fix compilation error after ce0fcd4dd65a23aebf2601570e335c1b6ce2a0c9 This commit had a small semantic conflict with another commit that went into master before it. This fixes the trivial issue.
Change-Id: I54f714d6f1eb2929784f0a2cf2e18a18c97ac980 Reviewed-on: http://gerrit.cloudera.org:8080/4331 Reviewed-by: Adar Dembo <[email protected]> Tested-by: Todd Lipcon <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/2876683b Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/2876683b Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/2876683b Branch: refs/heads/master Commit: 2876683bc9f2798f1acc7d73b1939d7134718578 Parents: ce0fcd4 Author: Todd Lipcon <[email protected]> Authored: Wed Sep 7 18:38:13 2016 -0700 Committer: Todd Lipcon <[email protected]> Committed: Thu Sep 8 02:03:46 2016 +0000 ---------------------------------------------------------------------- src/kudu/consensus/consensus_queue.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/2876683b/src/kudu/consensus/consensus_queue.cc ---------------------------------------------------------------------- diff --git a/src/kudu/consensus/consensus_queue.cc b/src/kudu/consensus/consensus_queue.cc index b7dff82..dd905b8 100644 --- a/src/kudu/consensus/consensus_queue.cc +++ b/src/kudu/consensus/consensus_queue.cc @@ -398,10 +398,10 @@ Status PeerMessageQueue::RequestForPeer(const string& uuid, // logging this fact periodically. if (request->ops_size() > 0) { int64_t last_op_sent = request->ops(request->ops_size() - 1).id().index(); - if (last_op_sent < request->committed_index().index()) { + if (last_op_sent < request->committed_index()) { KLOG_EVERY_N_SECS_THROTTLER(INFO, 3, peer->status_log_throttler, "lagging") << LogPrefixUnlocked() << "Peer " << uuid << " is lagging by at least " - << (request->committed_index().index() - last_op_sent) + << (request->committed_index() - last_op_sent) << " ops behind the committed index " << THROTTLE_MSG; } }
