From: Xuehan Xu <xxhdx1985126@gmail.com>
Date: Wed, 4 Nov 2020 02:13:13 +0000 (+0800)
Subject: crimson/osd: reset pending_txn's all_committed after set its value
X-Git-Tag: v16.1.0~642^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f495290a1085e477487d7cb3d1b62c2a26bb49b;p=ceph.git

crimson/osd: reset pending_txn's all_committed after set its value

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
---

diff --git a/src/crimson/osd/replicated_backend.cc b/src/crimson/osd/replicated_backend.cc
index 3bde1e9d6f2..3a131278b0c 100644
--- a/src/crimson/osd/replicated_backend.cc
+++ b/src/crimson/osd/replicated_backend.cc
@@ -90,10 +90,11 @@ ReplicatedBackend::_submit_transaction(std::set<pg_shard_t>&& pg_shards,
       }
       if (--peers->pending == 0) {
         peers->all_committed.set_value();
+	peers->all_committed = {};
+	return seastar::now();
       }
       return peers->all_committed.get_future();
     }).then([pending_txn, this] {
-      pending_txn->second.all_committed = {};
       auto acked_peers = std::move(pending_txn->second.acked_peers);
       pending_trans.erase(pending_txn);
       return seastar::make_ready_future<crimson::osd::acked_peers_t>(std::move(acked_peers));
@@ -122,7 +123,8 @@ void ReplicatedBackend::got_rep_op_reply(const MOSDRepOpReply& reply)
     if (peer.shard == reply.from) {
       peer.last_complete_ondisk = reply.get_last_complete_ondisk();
       if (--peers.pending == 0) {
-        peers.all_committed.set_value();    
+        peers.all_committed.set_value();
+        peers.all_committed = {};
       }
       return;
     }