diff --git a/src/erasure-code/lrc/ErasureCodeLrc.cc b/src/erasure-code/lrc/ErasureCodeLrc.cc index ba8f26a7b71..2a17ef83198 100644 --- a/src/erasure-code/lrc/ErasureCodeLrc.cc +++ b/src/erasure-code/lrc/ErasureCodeLrc.cc @@ -225,8 +225,6 @@ int ErasureCodeLrc::layers_init(ostream *ss) layer.profile["plugin"] = "jerasure"; if (layer.profile.find("technique") == layer.profile.end()) layer.profile["technique"] = "reed_sol_van"; - if (layer.profile.find("directory") == layer.profile.end()) - layer.profile["directory"] = directory; int err = registry.factory(layer.profile["plugin"], directory, layer.profile, @@ -274,9 +272,6 @@ int ErasureCodeLrc::parse(ErasureCodeProfile &profile, if (r) return r; - if (profile.count("directory") != 0) - directory = profile.find("directory")->second; - return parse_ruleset(profile, ss); } diff --git a/src/erasure-code/lrc/ErasureCodePluginLrc.cc b/src/erasure-code/lrc/ErasureCodePluginLrc.cc index 4051e30793a..5f22cc6bf90 100644 --- a/src/erasure-code/lrc/ErasureCodePluginLrc.cc +++ b/src/erasure-code/lrc/ErasureCodePluginLrc.cc @@ -35,7 +35,6 @@ public: ostream *ss) { ErasureCodeLrc *interface; interface = new ErasureCodeLrc(directory); - assert(profile.count("directory") != 0); int r = interface->init(profile, ss); if (r) { delete interface; diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 9244820bed5..87c0358b3f5 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -4177,10 +4177,6 @@ int OSDMonitor::parse_erasure_code_profile(const vector &erasure_code_pr if (user_map.count("plugin") && user_map["plugin"] != default_plugin) (*erasure_code_profile_map) = user_map; - if ((*erasure_code_profile_map).count("directory") == 0) - (*erasure_code_profile_map)["directory"] = - g_conf->erasure_code_dir; - return 0; } diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 26e71615ab4..b9520fbe31c 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -2718,8 +2718,6 @@ int OSDMap::get_erasure_code_profile_default(CephContext *cct, int r = get_json_str_map(cct->_conf->osd_pool_default_erasure_code_profile, *ss, &profile_map); - profile_map["directory"] = - cct->_conf->erasure_code_dir; return r; }