Merge pull request ceph#62805 from Matan-B/wip-matanb-rep-read-perfcount

osd/PrimaryLogPG: Relax replicated reads when recovering

Reviewed-by: Samuel Just <[email protected]>

Author: yuriw

src/osd/PrimaryLogPG.cc

@@ -2195,7 +2195,9 @@ void PrimaryLogPG::do_op(OpRequestRef& op)
 
   // missing object?
   if (is_unreadable_object(head)) {
-    if (!is_primary()) {
+    if (!is_primary() && is_missing_any_head_or_clone_of(head)) {
+      dout(10) << __func__ <<  "possibly missing clone object " << head
+               << " on this replica, bouncing to primary" << dendl;
       osd->logger->inc(l_osd_replica_read_redirect_missing);
       osd->reply_op_error(op, -EAGAIN);
       return;

src/osd/PrimaryLogPG.h

@@ -1892,6 +1892,9 @@ class PrimaryLogPG : public PG,
       !recovery_state.get_missing_loc().readable_with_acting(
 	oid, get_actingset());
   }
+  bool is_missing_any_head_or_clone_of(const hobject_t &hoid) {
+    return recovery_state.is_missing_any_head_or_clone_of(hoid);
+  }
   void maybe_kick_recovery(const hobject_t &soid);
   void wait_for_unreadable_object(const hobject_t& oid, OpRequestRef op);
   void finish_unreadable_object(const hobject_t oid);