RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 09:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not include directory in ec profiles

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-08-21 15:55:47 -04:00
parent 660ae5bcbb
commit 5df12716b1
4 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/erasure-code/lrc/ErasureCodeLrc.cc
View File

@ -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);
}

1
src/erasure-code/lrc/ErasureCodePluginLrc.cc
View File

@ -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;

4
src/mon/OSDMonitor.cc
View File

@ -4177,10 +4177,6 @@ int OSDMonitor::parse_erasure_code_profile(const vector<string> &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;
}

2
src/osd/OSDMap.cc
View File

@ -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;
}