]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG::maybe_handle_cache: do not skip promote for write_ordered 5200/head
authorSamuel Just <sam.just@inktank.com>
Tue, 12 Aug 2014 22:24:26 +0000 (15:24 -0700)
committerNathan Cutler <ncutler@suse.com>
Sat, 11 Jul 2015 09:49:48 +0000 (11:49 +0200)
We cannot redirect a RW ordered read.

Fixes: #9064
Introduced: 0ed3adc1e0a74bf9548d1d956aece11f019afee0
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 24aeca9c439474b079d23600d8d42c0af5d9ce5c)

src/osd/ReplicatedPG.cc

index 04ed78ce8fe8ccb63e24d9164d3657dfef1a7966..0e56404912501feb14869c233bc81693a66794f6 100644 (file)
@@ -1610,7 +1610,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) {