minor changes.

tikv · Oct 11, 2016 · f9e37d2 · f9e37d2
1 parent fbaa435
commit f9e37d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/raftstore/store/peer.rs b/src/raftstore/store/peer.rs
@@ -529,11 +529,6 @@ impl Peer {
         debug!("{} propose command with uuid {:?}", self.tag, cmd.uuid);
         PEER_PROPOSAL_COUNTER_VEC.with_label_values(&["all"]).inc();
 
-        if let Err(e) = self.check_epoch(&req) {
-            cmd_resp::bind_error(&mut err_resp, e);
-            return cmd.cb.call_box((err_resp,));
-        }
-
         let local_read = self.is_local_read(&req);
         if local_read {
             PEER_PROPOSAL_COUNTER_VEC.with_label_values(&["local_read"]).inc();

diff --git a/src/raftstore/store/store.rs b/src/raftstore/store/store.rs
@@ -946,13 +946,12 @@ impl<T: Transport, C: PdClient> Store<T, C> {
         // but it doesn't matter, if the peer is not leader, the proposing command
         // log entry can't be committed.
 
-
+        let mut peer = self.region_peers.get_mut(&region_id).unwrap();
         let pending_cmd = PendingCmd {
             uuid: uuid,
-            term: resp.get_header().get_current_term(),
+            term: peer.term(),
             cb: cb,
         };
-        let mut peer = self.region_peers.get_mut(&region_id).unwrap();
         try!(peer.propose(pending_cmd, msg, resp));
 
         self.pending_raft_groups.insert(region_id);