enable locally read index

Signed-off-by: 5kbpers <tangminghua@pingcap.com>
tikv · Sep 4, 2019 · 43c70f5 · 43c70f5
1 parent 665a0d3
commit 43c70f5
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/raftstore/store/peer.rs b/src/raftstore/store/peer.rs
@@ -782,7 +782,7 @@ impl Peer {
     }
 
     /// Steps the raft message.
-    pub fn step(&mut self, m: eraftpb::Message) -> Result<()> {
+    pub fn step(&mut self, mut m: eraftpb::Message) -> Result<()> {
         fail_point!(
             "step_message_3_1",
             { self.peer.get_store_id() == 3 && self.region_id == 1 },
@@ -798,17 +798,17 @@ impl Peer {
         }
         // Here we hold up MsgReadIndex. If current peer has valid lease, then we could handle the
         // request directly, rather than send a heartbeat to check quorum.
-        let msg_type = msg.get_msg_type();
+        let msg_type = m.get_msg_type();
         if msg_type == MessageType::MsgReadIndex {
             match self.inspect_lease() {
                 LeaseState::Valid => {
-                    let resp = eraftpb::Message::default();
+                    let mut resp = eraftpb::Message::default();
                     resp.set_msg_type(MessageType::MsgReadIndexResp);
                     resp.to = m.from;
                     resp.index = self.get_store().committed_index();
                     resp.set_entries(m.take_entries());
 
-                    self.pending_messages.append(resp);
+                    self.pending_messages.push(resp);
                     return Ok(());
                 }
                 _ => (),
@@ -1903,7 +1903,7 @@ impl Peer {
 
     fn read_local<T, C>(&mut self, ctx: &mut PollContext<T, C>, req: RaftCmdRequest, cb: Callback) {
         ctx.raft_metrics.propose.local_read += 1;
-        cb.invoke_read(self.handle_read(ctx, req, false, None))
+        cb.invoke_read(self.handle_read(ctx, req, false, Some(self.get_store().committed_index())))
     }
 
     fn pre_read_index(&self) -> Result<()> {