Merge pull request ceph#62812 from Matan-B/wip-matanb-crimson-only-backfill-stuck

crimson/osd: fix do_recovery returned boolean

Reviewed-by: Samuel Just <[email protected]>
Reviewed-by: Xuehan Xu <[email protected]>
Reviewed-by: Mohit Agrawal <[email protected]>

Author: Matan-B

src/crimson/osd/osd_operations/background_recovery.cc

@@ -82,11 +82,11 @@ seastar::future<> BackgroundRecoveryT<T>::start()
        return do_recovery();
       }, [](std::exception_ptr) {
        return seastar::make_ready_future<bool>(false);
-      }, pg, epoch_started).then([](bool recovery_done) {
-       if (recovery_done) {
-         return seastar::stop_iteration::yes;
-       } else {
+      }, pg, epoch_started).then([](bool do_recovery) {
+       if (do_recovery) {
          return seastar::stop_iteration::no;
+       } else {
+         return seastar::stop_iteration::yes;
        }
       });
     });

src/crimson/osd/pg_recovery.cc

@@ -82,8 +82,8 @@ PGRecovery::start_recovery_ops(
     ceph_assert(pg->is_recovering());
     ceph_assert(!pg->is_backfilling());
 
-    bool done = !pg->get_peering_state().needs_recovery();
-    if (done) {
+    bool do_recovery = pg->get_peering_state().needs_recovery();
+    if (!do_recovery) {
       logger().debug("start_recovery_ops: AllReplicasRecovered for pg: {}",
                      pg->get_pgid());
       using LocalPeeringEvent = crimson::osd::LocalPeeringEvent;
@@ -110,7 +110,7 @@ PGRecovery::start_recovery_ops(
       }
       pg->reset_pglog_based_recovery_op();
     }
-    return seastar::make_ready_future<bool>(done);
+    return seastar::make_ready_future<bool>(do_recovery);
   });
 }