From fe12f32d2d09488bc0f8eafb74aafe4d77a27421 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 24 Feb 2021 16:20:18 -0500 Subject: [PATCH] mon/KVMonitor: fix 'osd new' cross-service commit When we converted ConfigKeyService to KVMonitor, we didn't correctly change this to propose_pending(), which mean that the kv change wasn't captured in the paxos transaction. Fixes: bb7ebc41532aeb23cff2241ab07b3f01c2f57ddd Fixes: https://tracker.ceph.com/issues/49460 Signed-off-by: Sage Weil (cherry picked from commit 66891b4845fbf119cacb2c77d39180e28c6626d5) --- src/mon/KVMonitor.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mon/KVMonitor.cc b/src/mon/KVMonitor.cc index 5977e296c9567..699cbe4170395 100644 --- a/src/mon/KVMonitor.cc +++ b/src/mon/KVMonitor.cc @@ -376,7 +376,7 @@ void KVMonitor::do_osd_destroy(int32_t id, uuid_d& uuid) pending[iter->key()] = boost::none; } - paxos.trigger_propose(); + propose_pending(); } int KVMonitor::validate_osd_new( @@ -417,6 +417,8 @@ void KVMonitor::do_osd_new( dmcrypt_key_value.append(dmcrypt_key); pending[dmcrypt_key_prefix] = dmcrypt_key_value; + + propose_pending(); } -- 2.39.5