From 020e543e34e4679b6a53a72432b1221379376f03 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 13 Feb 2014 15:40:30 +0100 Subject: [PATCH] mon: do not goto reply if a ruleset exists in pending If the crush ruleset is found in pending, do not goto reply because it does not exist yet. Wait for the pending proposal (and the ruleset) to be accepted and then only return that it exists. revert 4b687ba673574bcd3b77b0f79a07d5c74cdcedc2 Signed-off-by: Loic Dachary --- src/mon/OSDMonitor.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index b0e86bae72c..ea83ff6c876 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -3716,7 +3716,6 @@ bool OSDMonitor::prepare_command_impl(MMonCommand *m, if (newcrush.rule_exists(name)) { ss << "rule " << name << " already exists"; err = 0; - goto reply; } else { int rule = newcrush.add_simple_ruleset(name, root, type, mode, pg_pool_t::TYPE_REPLICATED, &ss); @@ -3760,7 +3759,6 @@ bool OSDMonitor::prepare_command_impl(MMonCommand *m, if (newcrush.rule_exists(name)) { ss << "rule " << name << " already exists"; err = 0; - goto reply; } else { ErasureCodeInterfaceRef erasure_code; err = get_erasure_code(properties_map, &erasure_code, ss); -- 2.47.3