]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mon/OSDMonitor: make pre-luminous clients resend ops on split
authorSage Weil <sage@redhat.com>
Thu, 2 Feb 2017 15:21:33 +0000 (10:21 -0500)
committerSage Weil <sage@redhat.com>
Mon, 13 Feb 2017 16:44:53 +0000 (11:44 -0500)
Pre-luminous clients do not understand that a split PG forms a new
interval.  Make them resend ops to work around this.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc

index f14728c921198b00027741c448f300d426119b46..80b83f44d9f46bcecc4f5cfe6f108dd0ce33bd0d 100644 (file)
@@ -5222,6 +5222,9 @@ int OSDMonitor::prepare_command_pool_set(map<string,cmd_vartype> &cmdmap,
       return -E2BIG;
     }
     p.set_pg_num(n);
+    // force pre-luminous clients to resend their ops, since they
+    // don't understand that split PGs now form a new interval.
+    p.last_force_op_resend_preluminous = pending_inc.epoch;
   } else if (var == "pgp_num") {
     if (p.has_flag(pg_pool_t::FLAG_NOPGCHANGE)) {
       ss << "pool pgp_num change is disabled; you must unset nopgchange flag for the pool first";