]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: fix promote obc setup when recency > 1
authorSage Weil <sage@redhat.com>
Mon, 1 Feb 2016 14:27:43 +0000 (09:27 -0500)
committerSage Weil <sage@redhat.com>
Tue, 1 Mar 2016 13:42:47 +0000 (08:42 -0500)
Pass promote_obc like the other call sites.

This was broken by d36d7f24fb001c136ec5a0c8bf9e52411d6c0947.

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

index 8286b774ad5a3403e59e41c27c2c378a05d7cf19..4402ec2b0be08defada0fa14bf6c50c050555b88 100644 (file)
@@ -2366,7 +2366,7 @@ bool ReplicatedPG::maybe_promote(ObjectContextRef obc,
        }
       }
       if (count >= recency) {
-       promote_object(obc, missing_oid, oloc, promote_op);
+       promote_object(obc, missing_oid, oloc, promote_op, promote_obc);
       } else {
        // not promoting
        return false;