osd: CEPH_FEATURE_RECOVERY_RESERVATION feature now required

Feature present since at least the Dumpling release.
A later commit will add it to the osd_required mask

Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index caa6351cdc50cd761cf435ebc292b42fa13bc0db..8443ff0efc9b194414dc9c14de36ee8585f7d1b6 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -6180,16 +6180,12 @@ PG::RecoveryState::WaitRemoteRecoveryReserved::react(const RemoteRecoveryReserve
     ConnectionRef con = pg->osd->get_con_osd_cluster(
       remote_recovery_reservation_it->osd, pg->get_osdmap()->get_epoch());
     if (con) {
-      if (con->has_feature(CEPH_FEATURE_RECOVERY_RESERVATION)) {
-       pg->osd->send_message_osd_cluster(
-          new MRecoveryReserve(
-           MRecoveryReserve::REQUEST,
-           spg_t(pg->info.pgid.pgid, remote_recovery_reservation_it->shard),
-           pg->get_osdmap()->get_epoch()),
-         con.get());
-      } else {
-       post_event(RemoteRecoveryReserved());
-      }
+      pg->osd->send_message_osd_cluster(
+        new MRecoveryReserve(
+         MRecoveryReserve::REQUEST,
+         spg_t(pg->info.pgid.pgid, remote_recovery_reservation_it->shard),
+         pg->get_osdmap()->get_epoch()),
+       con.get());
     }
     ++remote_recovery_reservation_it;
   } else {
@@ -6233,14 +6229,12 @@ void PG::RecoveryState::Recovering::release_reservations()
     ConnectionRef con = pg->osd->get_con_osd_cluster(
       i->osd, pg->get_osdmap()->get_epoch());
     if (con) {
-      if (con->has_feature(CEPH_FEATURE_RECOVERY_RESERVATION)) {
-       pg->osd->send_message_osd_cluster(
-          new MRecoveryReserve(
-           MRecoveryReserve::RELEASE,
-           spg_t(pg->info.pgid.pgid, i->shard),
-           pg->get_osdmap()->get_epoch()),
-         con.get());
-      }
+      pg->osd->send_message_osd_cluster(
+        new MRecoveryReserve(
+         MRecoveryReserve::RELEASE,
+         spg_t(pg->info.pgid.pgid, i->shard),
+         pg->get_osdmap()->get_epoch()),
+       con.get());
     }
   }
 }