pd: cancel call when refreshing client (tikv#2669)

* pd: cancel call when refreshing client
sticnarf · Jan 12, 2018 · bb7dfa8 · bb7dfa8
1 parent d8a4f08
commit bb7dfa8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/pd/client.rs b/src/pd/client.rs
@@ -310,7 +310,7 @@ impl PdClient for RpcClient {
                                     Error::Other(box_err!("failed to recv heartbeat: {:?}", e))
                                 }).map(|r| (r, WriteFlags::default())),
                             )
-                            .map(|_| ()),
+                            .map(|(mut sender, _)| sender.get_mut().cancel()),
                     ) as PdFuture<_>
                 }
                 None => unreachable!(),

diff --git a/src/pd/util.rs b/src/pd/util.rs
@@ -67,12 +67,14 @@ impl Stream for HeartbeatReceiver {
                 }
             }
 
+            warn!("heartbeat receiver is stale, refreshing..");
             self.receiver.take();
 
             let mut inner = self.inner.wl();
             let mut receiver = None;
             if let Either::Left(ref mut recv) = inner.hb_receiver {
                 receiver = recv.take();
+                info!("heartbeat receiver is refreshed.");
             }
             if receiver.is_some() {
                 self.receiver = receiver;