ReplicatedPG::finish_ctx: take excl lock if operation is rw

Fixes: #11677
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 5c2b795724423ed484ab451de855ddcfc085342b)

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 37b2f51ad82088068930b036ab68ccd97a5829f3..ce7a5dfb1f0d002225d743de14635915bc553350 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5711,7 +5711,13 @@ void ReplicatedPG::finish_ctx(OpContext *ctx, int log_op_type, bool maintain_ssc
 
       if (!ctx->snapset_obc)
        ctx->snapset_obc = get_object_context(snapoid, true);
-      bool got = ctx->snapset_obc->get_write_greedy(ctx->op);
+      bool got = false;
+      if (ctx->lock_to_release == OpContext::W_LOCK) {
+       got = ctx->snapset_obc->get_write_greedy(ctx->op);
+      } else {
+       assert(ctx->lock_to_release == OpContext::E_LOCK);
+       got = ctx->snapset_obc->get_excl(ctx->op);
+      }
       assert(got);
       dout(20) << " got greedy write on snapset_obc " << *ctx->snapset_obc << dendl;
       ctx->release_snapset_obc = true;