From 4587a379a3527f7f2fb92ca37a3ab22af4c86e77 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 29 Mar 2016 12:50:22 -0400 Subject: [PATCH] osdc/Objecter: use cct's crush_location Keep the observer so that we refresh our copy of the multimap. Signed-off-by: Sage Weil --- src/osdc/Objecter.cc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 13ba2382b5940..8552e6018cf0b 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -184,16 +184,7 @@ void Objecter::handle_conf_change(const struct md_config_t *conf, void Objecter::update_crush_location() { unique_lock wl(rwlock); - std::multimap new_crush_location; - vector lvec; - get_str_vec(cct->_conf->crush_location, ";, \t", lvec); - int r = CrushWrapper::parse_loc_multimap(lvec, &new_crush_location); - if (r < 0) { - lderr(cct) << "warning: crush_location '" << cct->_conf->crush_location - << "' does not parse, leave origin crush_location untouched." << dendl; - return; - } - crush_location = new_crush_location; + crush_location = cct->crush_location.get_location(); } // messages ------------------------------ -- 2.39.5