From: Xuehan Xu <xxhdx1985126@163.com>
Date: Mon, 8 Jun 2020 06:41:06 +0000 (+0800)
Subject: crimson: do not assert in start_backfill_ops
X-Git-Tag: v16.1.0~2024^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=850d92ed5f670f1426065045639311d14655d2bd;p=ceph.git

crimson: do not assert in start_backfill_ops

osd_recovery_max_single_start is not necessarily used up in start_recovery_ops, and
start_backfill_ops could be invoked even there's no need to backfill, so do not assert
here, just return.

Signed-off-by: Xuehan Xu <xxhdx1985126@163.com>
---

diff --git a/src/crimson/osd/pg_recovery.cc b/src/crimson/osd/pg_recovery.cc
index a77f67ccfe1..f954d4553ec 100644
--- a/src/crimson/osd/pg_recovery.cc
+++ b/src/crimson/osd/pg_recovery.cc
@@ -259,8 +259,8 @@ size_t PGRecovery::start_backfill_ops(
   size_t max_to_start,
   std::vector<crimson::osd::blocking_future<>> *out)
 {
-  assert(!pg->get_peering_state().get_backfill_targets().empty());
-
+  if (pg->get_peering_state().get_backfill_targets().empty())
+    return 0;
   ceph_abort("not implemented!");
 }