Fix:info replication slow (#1898)

* Update rsync_client.cc
OpenAtomFoundation · Aug 10, 2023 · 1f219c1 · 1f219c1
1 parent 5fd92fd
commit 1f219c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/include/rsync_client.h b/include/rsync_client.h
@@ -155,7 +155,7 @@ class WaitObject {
     pstd::Status s = Status::Timeout("rsync timeout", "timeout");
     {
       std::unique_lock<std::mutex> lock(mu_);
-      auto cv_s = cond_.wait_for(lock, std::chrono::seconds(3), [this] {
+      auto cv_s = cond_.wait_for(lock, std::chrono::seconds(1), [this] {
           return resp_ != nullptr;
       });
       if (!cv_s) {

diff --git a/src/rsync_client.cc b/src/rsync_client.cc
@@ -27,7 +27,7 @@ RsyncClient::RsyncClient(const std::string& dir, const std::string& db_name, con
     : snapshot_uuid_(""), dir_(dir), db_name_(db_name), slot_id_(slot_id),
       state_(IDLE), max_retries_(10), master_ip_(""), master_port_(0) {
   wo_mgr_.reset(new WaitObjectManager());
-  client_thread_ = std::make_unique<RsyncClientThread>(10 * 1000, 60 * 1000, wo_mgr_.get());
+  client_thread_ = std::make_unique<RsyncClientThread>(3000, 60, wo_mgr_.get());
   work_threads_.resize(kMaxRsyncParallelNum);
   throttle_.reset(new Throttle(kThrottleBytesPerSecond, kThrottleCheckCycle));
   finished_work_cnt_.store(0);
@@ -157,6 +157,9 @@ Status RsyncClient::CopyRemoteFile(const std::string& filename, int index) {
     };
 
     while (retries < max_retries_) {
+      if (state_.load() != RUNNING) {
+        break;
+        }
       size_t copy_file_begin_time = pstd::NowMicros();
       size_t count = throttle_->ThrottledByThroughput(kBytesPerRequest);
       if (count == 0) {