osd: send ops back to primary if replica is not readable

This is the simplest strategy--much simpler than queueing them and
waking them up again later.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 98e70ac1f36ca3014680d32019125983a0b33fbb..07c0e252b367dec70f4a0a51b410dd9bb6e25f3e 100644 (file)
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -1145,7 +1145,8 @@ void PeeringState::proc_lease(const pg_lease_t& l)
   if (ru > readable_until) {
     readable_until = ru;
     psdout(20) << __func__ << " readable_until now " << readable_until << dendl;
-#warning fixme: wake up replica?
+    // NOTE: if we ever decide to block/queue ops on the replica,
+    // we'll need to wake them up here.
   }
 
   ceph::signedspan ruub;

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index de99a66acb95ad525f990d48090cc8c44a79dedb..2947c51f37c6d492fa721507135fee072891444f 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -767,6 +767,11 @@ bool PrimaryLogPG::check_laggy(OpRequestRef& op)
             << " mnow " << mnow
             << " > readable_until " << ru << dendl;
 
+    if (!is_primary()) {
+      osd->reply_op_error(op, -EAGAIN);
+      return false;
+    }
+
     // go to laggy state
     state_set(PG_STATE_LAGGY);
     publish_stats_to_osd();