fix: replication error message and scan command yield

dragonflydb · Feb 26, 2025 · 068058b · 068058b
1 parent 8512f72
commit 068058b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/server/generic_family.cc b/src/server/generic_family.cc
@@ -624,8 +624,7 @@ void OpScan(const OpArgs& op_args, const ScanOpts& scan_opts, uint64_t* cursor,
   const size_t limit = 10000;
   do {
     if (buckets_iterated >= limit) {
-      buckets_iterated = 0;
-      util::ThisFiber::Yield();
+      break;
     }
     {
       // Disable flush journal changes to prevent preemtion in traverse.

diff --git a/src/server/replica.cc b/src/server/replica.cc
@@ -93,7 +93,7 @@ GenericError Replica::Start() {
 
   auto check_connection_error = [this](error_code ec, const char* msg) -> GenericError {
     if (!cntx_.IsRunning()) {
-      return {std::make_error_code(errc::operation_canceled), "replication cancelled"};
+      return {"replication cancelled"};
     }
     if (ec) {
       cntx_.ReportCancelError();