]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG::maybe_handle_cache: do not skip promote for write_ordered 2246/head
authorSamuel Just <sam.just@inktank.com>
Tue, 12 Aug 2014 22:24:26 +0000 (15:24 -0700)
committerSamuel Just <sam.just@inktank.com>
Tue, 12 Aug 2014 22:25:03 +0000 (15:25 -0700)
We cannot redirect a RW ordered read.

Fixes: #9064
Introduced: 0ed3adc1e0a74bf9548d1d956aece11f019afee0
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/ReplicatedPG.cc

index 1a83a632f695952dc14f35de65ba6025b4482db5..6250796ee0d2ba3715f0801ecc5be45c1978eb4a 100644 (file)
@@ -1605,7 +1605,7 @@ bool ReplicatedPG::maybe_handle_cache(OpRequestRef op,
     if (!must_promote && can_skip_promote(op, obc)) {
       return false;
     }
-    if (op->may_write() || must_promote || !hit_set) {
+    if (op->may_write() || write_ordered || must_promote || !hit_set) {
       promote_object(op, obc, missing_oid);
     } else {
       switch (pool.info.min_read_recency_for_promote) {