common,erasure-code,mon: s/erasure-code-//

The parameters to erasure code do not need to be prefixed with the
erasure-code- string. There only are erasure-code parameters and the
prefix was originaly intended to desambiguate the erasure-code
properties, assuming that the properties map could be used for other
purposes.

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 61fcc4c4b5b752000e31afe8c313d6c8edd1a929..34dc45cb4cfbd97cbd5d1c241a606aede37f3c58 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -423,10 +423,10 @@ OPTION(osd_pool_default_pgp_num, OPT_INT, 8) // number of PGs for placement purp
 OPTION(osd_pool_default_erasure_code_directory, OPT_STR, CEPH_PKGLIBDIR"/erasure-code") // default for the erasure-code-directory=XXX property of osd pool create
 OPTION(osd_pool_default_erasure_code_properties,
        OPT_STR,
-       "erasure-code-plugin=jerasure "
-       "erasure-code-technique=reed_sol_van "
-       "erasure-code-k=4 "
-       "erasure-code-m=2 "
+       "plugin=jerasure "
+       "technique=reed_sol_van "
+       "k=2 "
+       "m=1 "
        ) // default properties of osd pool create
 OPTION(osd_pool_default_flags, OPT_INT, 0)   // default flags for new pools
 OPTION(osd_pool_default_flag_hashpspool, OPT_BOOL, true)   // use new pg hashing to prevent pool/pg overlap

diff --git a/src/erasure-code/ErasureCodePlugin.cc b/src/erasure-code/ErasureCodePlugin.cc
index f60ec1b31d9751648c783f73f6b3790aac9b50fe..786808f12f2981c25e33a713be385d4f339fcf2f 100644 (file)
--- a/src/erasure-code/ErasureCodePlugin.cc
+++ b/src/erasure-code/ErasureCodePlugin.cc
@@ -95,8 +95,8 @@ int ErasureCodePluginRegistry::load(const std::string &plugin_name,
                                    const map<std::string,std::string> &parameters,
                                    ErasureCodePlugin **plugin)
 {
-  assert(parameters.count("erasure-code-directory") != 0);
-  std::string fname = parameters.find("erasure-code-directory")->second
+  assert(parameters.count("directory") != 0);
+  std::string fname = parameters.find("directory")->second
     + "/" PLUGIN_PREFIX
     + plugin_name + PLUGIN_SUFFIX;
   dout(10) << "load " << plugin_name << " from " << fname << dendl;

diff --git a/src/erasure-code/jerasure/ErasureCodeJerasure.cc b/src/erasure-code/jerasure/ErasureCodeJerasure.cc
index c46637295f36cf760d271363c93476689518b940..9e0254e52be7bfdfbcee04744416155ed2425135 100644 (file)
--- a/src/erasure-code/jerasure/ErasureCodeJerasure.cc
+++ b/src/erasure-code/jerasure/ErasureCodeJerasure.cc
@@ -50,10 +50,10 @@ void ErasureCodeJerasure::init(const map<string,string> &parameters)
 {
   dout(10) << "technique=" << technique << dendl;
   map<string,string>::const_iterator parameter;
-  parameter = parameters.find("erasure-code-ruleset-root");
+  parameter = parameters.find("ruleset-root");
   if (parameter != parameters.end())
     ruleset_root = parameter->second;
-  parameter = parameters.find("erasure-code-ruleset-failure-domain");
+  parameter = parameters.find("ruleset-failure-domain");
   if (parameter != parameters.end())
     ruleset_failure_domain = parameter->second;
   parse(parameters);
@@ -248,9 +248,9 @@ unsigned ErasureCodeJerasureReedSolomonVandermonde::get_alignment() const
 
 void ErasureCodeJerasureReedSolomonVandermonde::parse(const map<std::string,std::string> &parameters)
 {
-  k = to_int("erasure-code-k", parameters, DEFAULT_K);
-  m = to_int("erasure-code-m", parameters, DEFAULT_M);
-  w = to_int("erasure-code-w", parameters, DEFAULT_W);
+  k = to_int("k", parameters, DEFAULT_K);
+  m = to_int("m", parameters, DEFAULT_M);
+  w = to_int("w", parameters, DEFAULT_W);
   if (w != 8 && w != 16 && w != 32) {
     derr << "ReedSolomonVandermonde: w=" << w
         << " must be one of {8, 16, 32} : revert to 8 " << dendl;
@@ -291,9 +291,9 @@ unsigned ErasureCodeJerasureReedSolomonRAID6::get_alignment() const
 
 void ErasureCodeJerasureReedSolomonRAID6::parse(const map<std::string,std::string> &parameters)
 {
-  k = to_int("erasure-code-k", parameters, DEFAULT_K);
+  k = to_int("k", parameters, DEFAULT_K);
   m = 2;
-  w = to_int("erasure-code-w", parameters, DEFAULT_W);
+  w = to_int("w", parameters, DEFAULT_W);
   if (w != 8 && w != 16 && w != 32) {
     derr << "ReedSolomonRAID6: w=" << w
         << " must be one of {8, 16, 32} : revert to 8 " << dendl;
@@ -336,10 +336,10 @@ unsigned ErasureCodeJerasureCauchy::get_alignment() const
 
 void ErasureCodeJerasureCauchy::parse(const map<std::string,std::string> &parameters)
 {
-  k = to_int("erasure-code-k", parameters, DEFAULT_K);
-  m = to_int("erasure-code-m", parameters, DEFAULT_M);
-  w = to_int("erasure-code-w", parameters, DEFAULT_W);
-  packetsize = to_int("erasure-code-packetsize", parameters, DEFAULT_PACKETSIZE);
+  k = to_int("k", parameters, DEFAULT_K);
+  m = to_int("m", parameters, DEFAULT_M);
+  w = to_int("w", parameters, DEFAULT_W);
+  packetsize = to_int("packetsize", parameters, DEFAULT_PACKETSIZE);
 }
 
 void ErasureCodeJerasureCauchy::prepare_schedule(int *matrix)
@@ -406,10 +406,10 @@ unsigned ErasureCodeJerasureLiberation::get_alignment() const
 
 void ErasureCodeJerasureLiberation::parse(const map<std::string,std::string> &parameters)
 {
-  k = to_int("erasure-code-k", parameters, DEFAULT_K);
-  m = to_int("erasure-code-m", parameters, DEFAULT_M);
-  w = to_int("erasure-code-w", parameters, DEFAULT_W);
-  packetsize = to_int("erasure-code-packetsize", parameters, DEFAULT_PACKETSIZE);
+  k = to_int("k", parameters, DEFAULT_K);
+  m = to_int("m", parameters, DEFAULT_M);
+  w = to_int("w", parameters, DEFAULT_W);
+  packetsize = to_int("packetsize", parameters, DEFAULT_PACKETSIZE);
 
   bool error = false;
   if (k > w) {
@@ -458,10 +458,10 @@ void ErasureCodeJerasureBlaumRoth::prepare()
 //
 void ErasureCodeJerasureLiber8tion::parse(const map<std::string,std::string> &parameters)
 {
-  k = to_int("erasure-code-k", parameters, DEFAULT_K);
+  k = to_int("k", parameters, DEFAULT_K);
   m = DEFAULT_M;
   w = DEFAULT_W;
-  packetsize = to_int("erasure-code-packetsize", parameters, DEFAULT_PACKETSIZE);
+  packetsize = to_int("packetsize", parameters, DEFAULT_PACKETSIZE);
 
   bool error = false;
   if (k > w) {

diff --git a/src/erasure-code/jerasure/ErasureCodePluginJerasure.cc b/src/erasure-code/jerasure/ErasureCodePluginJerasure.cc
index aec22a4958a9ebbb9c07e7777d2e9192843ec11f..b5da3c05183ae85c2af4ff5b3c37f5b97d61f340 100644 (file)
--- a/src/erasure-code/jerasure/ErasureCodePluginJerasure.cc
+++ b/src/erasure-code/jerasure/ErasureCodePluginJerasure.cc
@@ -33,8 +33,8 @@ public:
                      ErasureCodeInterfaceRef *erasure_code) {
     ErasureCodeJerasure *interface;
     std::string t;
-    if (parameters.find("erasure-code-technique") != parameters.end())
-      t = parameters.find("erasure-code-technique")->second;
+    if (parameters.find("technique") != parameters.end())
+      t = parameters.find("technique")->second;
     if (t == "reed_sol_van") {
       interface = new ErasureCodeJerasureReedSolomonVandermonde();
     } else if (t == "reed_sol_r6_op") {

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 43c349621c11cdad943fc1fa68a96ebf0a5df0e1..25afed85aa1e1c1b4da836d433ae18bf8b9f69f7 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2849,8 +2849,8 @@ int OSDMonitor::get_erasure_code(const map<string,string> &properties,
                                 stringstream &ss)
 {
   map<string,string>::const_iterator plugin =
-    properties.find("erasure-code-plugin");
-  if (plugin == properties.end()) {
+    profile.find("plugin");
+  if (plugin == profile.end()) {
     ss << "cannot determine the erasure code plugin"
        << " because erasure-code-plugin is not in the properties "
        << properties;

diff --git a/src/test/erasure-code/TestErasureCodeJerasure.cc b/src/test/erasure-code/TestErasureCodeJerasure.cc
index c9ff18108fa59c2eae0a89ff1a033de049160e25..4b768a80ae2eb7dc6f90046f14c985c89e37d9eb 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeJerasure.cc
+++ b/src/test/erasure-code/TestErasureCodeJerasure.cc
@@ -44,10 +44,10 @@ TYPED_TEST(ErasureCodeTest, encode_decode)
 {
   TypeParam jerasure;
   map<std::string,std::string> parameters;
-  parameters["erasure-code-k"] = "2";
-  parameters["erasure-code-m"] = "2";
-  parameters["erasure-code-w"] = "7";
-  parameters["erasure-code-packetsize"] = "8";
+  parameters["k"] = "2";
+  parameters["m"] = "2";
+  parameters["w"] = "7";
+  parameters["packetsize"] = "8";
   jerasure.init(parameters);
 
 #define LARGE_ENOUGH 2048
@@ -113,10 +113,10 @@ TYPED_TEST(ErasureCodeTest, minimum_to_decode)
 {
   TypeParam jerasure;
   map<std::string,std::string> parameters;
-  parameters["erasure-code-k"] = "2";
-  parameters["erasure-code-m"] = "2";
-  parameters["erasure-code-w"] = "7";
-  parameters["erasure-code-packetsize"] = "8";
+  parameters["k"] = "2";
+  parameters["m"] = "2";
+  parameters["w"] = "7";
+  parameters["packetsize"] = "8";
   jerasure.init(parameters);
 
   //
@@ -211,9 +211,9 @@ TEST(ErasureCodeTest, encode)
 {
   ErasureCodeJerasureReedSolomonVandermonde jerasure;
   map<std::string,std::string> parameters;
-  parameters["erasure-code-k"] = "2";
-  parameters["erasure-code-m"] = "2";
-  parameters["erasure-code-w"] = "8";
+  parameters["k"] = "2";
+  parameters["m"] = "2";
+  parameters["w"] = "8";
   jerasure.init(parameters);
 
   unsigned alignment = jerasure.get_alignment();
@@ -292,9 +292,9 @@ TEST(ErasureCodeTest, create_ruleset)
     stringstream ss;
     ErasureCodeJerasureReedSolomonVandermonde jerasure;
     map<std::string,std::string> parameters;
-    parameters["erasure-code-k"] = "2";
-    parameters["erasure-code-m"] = "2";
-    parameters["erasure-code-w"] = "8";
+    parameters["k"] = "2";
+    parameters["m"] = "2";
+    parameters["w"] = "8";
     jerasure.init(parameters);
     int ruleset = jerasure.create_ruleset("myrule", *c, &ss);
     EXPECT_EQ(0, ruleset);
@@ -316,10 +316,10 @@ TEST(ErasureCodeTest, create_ruleset)
     stringstream ss;
     ErasureCodeJerasureReedSolomonVandermonde jerasure;
     map<std::string,std::string> parameters;
-    parameters["erasure-code-k"] = "2";
-    parameters["erasure-code-m"] = "2";
-    parameters["erasure-code-w"] = "8";
-    parameters["erasure-code-ruleset-root"] = "BAD";
+    parameters["k"] = "2";
+    parameters["m"] = "2";
+    parameters["w"] = "8";
+    parameters["ruleset-root"] = "BAD";
     jerasure.init(parameters);
     EXPECT_EQ(-ENOENT, jerasure.create_ruleset("otherrule", *c, &ss));
     EXPECT_EQ("root item BAD does not exist", ss.str());
@@ -328,10 +328,10 @@ TEST(ErasureCodeTest, create_ruleset)
     stringstream ss;
     ErasureCodeJerasureReedSolomonVandermonde jerasure;
     map<std::string,std::string> parameters;
-    parameters["erasure-code-k"] = "2";
-    parameters["erasure-code-m"] = "2";
-    parameters["erasure-code-w"] = "8";
-    parameters["erasure-code-ruleset-failure-domain"] = "WORSE";
+    parameters["k"] = "2";
+    parameters["m"] = "2";
+    parameters["w"] = "8";
+    parameters["ruleset-failure-domain"] = "WORSE";
     jerasure.init(parameters);
     EXPECT_EQ(-EINVAL, jerasure.create_ruleset("otherrule", *c, &ss));
     EXPECT_EQ("unknown type WORSE", ss.str());

diff --git a/src/test/erasure-code/TestErasureCodePlugin.cc b/src/test/erasure-code/TestErasureCodePlugin.cc
index 6f53e70ee947d520a249e69dd4105a017cace319..ac12518c28a80b550928436e31e981f33ea8cfef 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePlugin.cc
+++ b/src/test/erasure-code/TestErasureCodePlugin.cc
@@ -30,7 +30,7 @@ protected:
   public:
     virtual void *entry() {
       map<std::string,std::string> parameters;
-      parameters["erasure-code-directory"] = ".libs";
+      parameters["directory"] = ".libs";
       ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
       ErasureCodeInterfaceRef erasure_code;
       instance.factory("hangs", parameters, &erasure_code);
@@ -71,7 +71,7 @@ TEST_F(ErasureCodePluginRegistryTest, factory_mutex) {
 TEST_F(ErasureCodePluginRegistryTest, all)
 {
   map<std::string,std::string> parameters;
-  parameters["erasure-code-directory"] = ".libs";
+  parameters["directory"] = ".libs";
   ErasureCodeInterfaceRef erasure_code;
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
   EXPECT_FALSE(erasure_code);

diff --git a/src/test/erasure-code/TestErasureCodePluginJerasure.cc b/src/test/erasure-code/TestErasureCodePluginJerasure.cc
index c787c0fc539b640fa4a3c4cc33dcddc0e75f2511..c416c2cdd933293ac01e1a126823558b920988a6 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePluginJerasure.cc
+++ b/src/test/erasure-code/TestErasureCodePluginJerasure.cc
@@ -25,7 +25,7 @@ TEST(ErasureCodePlugin, factory)
 {
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
   map<std::string,std::string> parameters;
-  parameters["erasure-code-directory"] = ".libs";
+  parameters["directory"] = ".libs";
   {
     ErasureCodeInterfaceRef erasure_code;
     EXPECT_FALSE(erasure_code);
@@ -44,7 +44,7 @@ TEST(ErasureCodePlugin, factory)
   };
   for(const char **technique = techniques; *technique; technique++) {
     ErasureCodeInterfaceRef erasure_code;
-    parameters["erasure-code-technique"] = *technique;
+    parameters["technique"] = *technique;
     EXPECT_FALSE(erasure_code);
     EXPECT_EQ(0, instance.factory("jerasure", parameters, &erasure_code));
     EXPECT_TRUE(erasure_code);

diff --git a/src/test/erasure-code/ceph_erasure_code.cc b/src/test/erasure-code/ceph_erasure_code.cc
index a364de5276a5afed77cc02cb29e7172446eacb8a..303a6ac34b5b9aeeb0e4309d4c59f8c2a32f5d3c 100644 (file)
--- a/src/test/erasure-code/ceph_erasure_code.cc
+++ b/src/test/erasure-code/ceph_erasure_code.cc
@@ -103,10 +103,10 @@ int ErasureCodeCommand::setup(int argc, char** argv) {
     }
   }
 
-  if (parameters.count("erasure-code-directory") == 0)
-    parameters["erasure-code-directory"] = ".libs";
-  if (parameters.count("erasure-code-plugin") == 0) {
-    cerr << "--parameter erasure-code-plugin=<plugin> is mandatory" << endl;
+  if (parameters.count("directory") == 0)
+    parameters["directory"] = ".libs";
+  if (parameters.count("plugin") == 0) {
+    cerr << "--parameter plugin=<plugin> is mandatory" << endl;
     return 1;
   }
 
@@ -117,7 +117,7 @@ int ErasureCodeCommand::run() {
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
   instance.disable_dlclose = true;
   ErasureCodeInterfaceRef erasure_code;
-  int code = instance.factory(parameters["erasure-code-plugin"],
+  int code = instance.factory(parameters["plugin"],
                              parameters,
                              &erasure_code);
   if (code)
@@ -153,11 +153,11 @@ int main(int argc, char** argv) {
  *   make -j4 ceph_erasure_code &&
  *   valgrind --tool=memcheck --leak-check=full \
  *      ./ceph_erasure_code \
- *      --parameter erasure-code-plugin=jerasure \
- *      --parameter erasure-code-directory=.libs \
- *      --parameter erasure-code-technique=reed_sol_van \
- *      --parameter erasure-code-k=2 \
- *      --parameter erasure-code-m=2 \
+ *      --parameter plugin=jerasure \
+ *      --parameter directory=.libs \
+ *      --parameter technique=reed_sol_van \
+ *      --parameter k=2 \
+ *      --parameter m=2 \
  *      --get_chunk_size 1024 \
  *      --get_data_chunk_count \
  *      --get_chunk_count \

diff --git a/src/test/erasure-code/ceph_erasure_code_benchmark.cc b/src/test/erasure-code/ceph_erasure_code_benchmark.cc
index ce768ae36921820fd58d2a6cfecb061db6c19214..264c870874a2f2bb612b491a33b254f51e41f8cb 100644 (file)
--- a/src/test/erasure-code/ceph_erasure_code_benchmark.cc
+++ b/src/test/erasure-code/ceph_erasure_code_benchmark.cc
@@ -98,8 +98,8 @@ int ErasureCodeBench::setup(int argc, char** argv) {
     }
   }
 
-  if (parameters.count("erasure-code-directory") == 0)
-    parameters["erasure-code-directory"] = ".libs";
+  if (parameters.count("directory") == 0)
+    parameters["directory"] = ".libs";
 
   in_size = vm["size"].as<int>();
   max_iterations = vm["iterations"].as<int>();
@@ -127,8 +127,8 @@ int ErasureCodeBench::encode()
   int code = instance.factory(plugin, parameters, &erasure_code);
   if (code)
     return code;
-  int k = atoi(parameters["erasure-code-k"].c_str());
-  int m = atoi(parameters["erasure-code-m"].c_str());
+  int k = atoi(parameters["k"].c_str());
+  int m = atoi(parameters["m"].c_str());
 
   bufferlist in;
   in.append(string(in_size, 'X'));
@@ -155,8 +155,8 @@ int ErasureCodeBench::decode()
   int code = instance.factory(plugin, parameters, &erasure_code);
   if (code)
     return code;
-  int k = atoi(parameters["erasure-code-k"].c_str());
-  int m = atoi(parameters["erasure-code-m"].c_str());
+  int k = atoi(parameters["k"].c_str());
+  int m = atoi(parameters["m"].c_str());
 
   bufferlist in;
   in.append(string(in_size, 'X'));
@@ -208,10 +208,10 @@ int main(int argc, char** argv) {
  *   valgrind --tool=memcheck --leak-check=full \
  *      ./ceph_erasure_code_benchmark \
  *      --plugin jerasure \
- *      --parameter erasure-code-directory=.libs \
- *      --parameter erasure-code-technique=reed_sol_van \
- *      --parameter erasure-code-k=2 \
- *      --parameter erasure-code-m=2 \
+ *      --parameter directory=.libs \
+ *      --parameter technique=reed_sol_van \
+ *      --parameter k=2 \
+ *      --parameter m=2 \
  *      --iterations 1
  * "
  * End:

diff --git a/src/test/mon/osd-pool-create.sh b/src/test/mon/osd-pool-create.sh
index 70d0ff9dd124c832e95c583ec6ca9e24b386aa51..db922a8f1d6b396c57723a5462dbc5099dfcbe8f 100755 (executable)
--- a/src/test/mon/osd-pool-create.sh
+++ b/src/test/mon/osd-pool-create.sh
@@ -141,11 +141,11 @@ function TEST_erasure_crush_stripe_width_padded() {
     local dir=$1
     # setting osd_pool_erasure_code_stripe_width modifies the stripe_width
     # and it is padded as required by the default plugin
-    properties+=" erasure-code-plugin=jerasure"
-    properties+=" erasure-code-technique=reed_sol_van"
+    profile+=" plugin=jerasure"
+    profile+=" technique=reed_sol_van"
     k=4
-    properties+=" erasure-code-k=$k"
-    properties+=" erasure-code-m=2"
+    profile+=" k=$k"
+    profile+=" m=2"
     expected_chunk_size=2048
     actual_stripe_width=$(($expected_chunk_size * $k))
     desired_stripe_width=$(($actual_stripe_width - 1))