Merge branch 'master' into fix_filter_bug

vesoft-inc · Sep 19, 2023 · 3a84045 · 3a84045
2 parents c2cfe26 + e84e236
commit 3a84045
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/kvstore/raftex/Host.cpp b/src/kvstore/raftex/Host.cpp
@@ -426,11 +426,12 @@ folly::Future<cpp2::HeartbeatResponse> Host::sendHeartbeat(
         if (t.hasException()) {
           using TransportException = apache::thrift::transport::TTransportException;
           auto exWrapper = std::move(t).exception();
+          VLOG(2) << self->idStr_ << "Heartbeat: " << exWrapper.what();
           auto exception = exWrapper.get_exception<TransportException>();
-          VLOG(2) << self->idStr_ << "Heartbeat: " << exception->what();
-          // If we keeps receiving NOT_OPEN exception after some HB intervals,
+          // If we keeps receiving NOT_OPEN and TIMED_OUT exception after some HB intervals,
           // we can assume that the peer is down so we mark paused_ as true
-          if (exception && exception->getType() == TransportException::NOT_OPEN) {
+          if (exception && (exception->getType() == TransportException::NOT_OPEN ||
+                            exception->getType() == TransportException::TIMED_OUT)) {
             if (!self->paused_) {
               auto now = time::WallClock::fastNowInMilliSec();
               if (now - self->lastHeartbeatTime_ >=

diff --git a/src/kvstore/raftex/Host.h b/src/kvstore/raftex/Host.h
@@ -92,6 +92,7 @@ class Host final : public std::enable_shared_from_this<Host> {
     committedLogId_ = 0;
     sendingSnapshot_ = false;
     followerCommittedLogId_ = 0;
+    lastHeartbeatTime_ = 0;
   }
 
   /**