From a031aa278936a33793ceaa5a18259dca243a2b83 Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Wed, 17 Jan 2018 14:19:22 +1000 Subject: [PATCH] mon/OSDMonitor: Fix OSDMonitor error message outputs Partially fixes: http://tracker.ceph.com/issues/22351 Signed-off-by: Brad Hubbard --- src/mon/OSDMonitor.cc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 87ab8c03afea9..2e41505e41771 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -5187,16 +5187,22 @@ int OSDMonitor::prepare_new_pool(MonOpRequestRef op) string erasure_code_profile; stringstream ss; string rule_name; + int ret = 0; if (m->auid) - return prepare_new_pool(m->name, m->auid, m->crush_rule, rule_name, + ret = prepare_new_pool(m->name, m->auid, m->crush_rule, rule_name, 0, 0, erasure_code_profile, pg_pool_t::TYPE_REPLICATED, 0, FAST_READ_OFF, &ss); else - return prepare_new_pool(m->name, session->auid, m->crush_rule, rule_name, + ret = prepare_new_pool(m->name, session->auid, m->crush_rule, rule_name, 0, 0, erasure_code_profile, pg_pool_t::TYPE_REPLICATED, 0, FAST_READ_OFF, &ss); + + if (ret < 0) { + dout(10) << __func__ << " got " << ret << " " << ss.str() << dendl; + } + return ret; } int OSDMonitor::crush_rename_bucket(const string& srcname, @@ -5738,7 +5744,7 @@ int OSDMonitor::prepare_new_pool(string& name, uint64_t auid, r = prepare_pool_crush_rule(pool_type, erasure_code_profile, crush_rule_name, &crush_rule, ss); if (r) { - dout(10) << " prepare_pool_crush_rule returns " << r << dendl; + dout(10) << "prepare_pool_crush_rule returns " << r << dendl; return r; } if (g_conf->mon_osd_crush_smoke_test) { @@ -5753,7 +5759,7 @@ int OSDMonitor::prepare_new_pool(string& name, uint64_t auid, r = tester.test_with_fork(g_conf->mon_lease); auto duration = ceph::coarse_mono_clock::now() - start; if (r < 0) { - dout(10) << " tester.test_with_fork returns " << r + dout(10) << "tester.test_with_fork returns " << r << ": " << err.str() << dendl; *ss << "crush test failed with " << r << ": " << err.str(); return r; @@ -5764,12 +5770,12 @@ int OSDMonitor::prepare_new_pool(string& name, uint64_t auid, unsigned size, min_size; r = prepare_pool_size(pool_type, erasure_code_profile, &size, &min_size, ss); if (r) { - dout(10) << " prepare_pool_size returns " << r << dendl; + dout(10) << "prepare_pool_size returns " << r << dendl; return r; } r = check_pg_num(-1, pg_num, size, ss); if (r) { - dout(10) << " prepare_pool_size returns " << r << dendl; + dout(10) << "check_pg_num returns " << r << dendl; return r; } @@ -5780,7 +5786,7 @@ int OSDMonitor::prepare_new_pool(string& name, uint64_t auid, uint32_t stripe_width = 0; r = prepare_pool_stripe_width(pool_type, erasure_code_profile, &stripe_width, ss); if (r) { - dout(10) << " prepare_pool_stripe_width returns " << r << dendl; + dout(10) << "prepare_pool_stripe_width returns " << r << dendl; return r; } -- 2.47.3