Revert "osd: create the erasure-code ruleset in OSDMap::build_simple"

This reverts commit b85330eb1d62632a1c3f2025b1f309816d54bd5a.

We can't have this in the OSDMap by default or else all clients will require
the new features.

[Fixed up #include for strmap]

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 8d06c07a6b69b13e34f7c4dc0a9a4d71ec8448f3..a764f34cdbcc051b69c22c4398b0055d2b963b19 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -21,7 +21,7 @@
 #include "common/Formatter.h"
 #include "include/ceph_features.h"
 #include "include/str_map.h"
-#include "erasure-code/ErasureCodePlugin.h"
+
 #include "common/code_environment.h"
 
 #define dout_subsys ceph_subsys_osd
@@ -2555,26 +2555,6 @@ int OSDMap::build_simple(CephContext *cct, epoch_t e, uuid_d &fsid,
   erasure_code_profile_map["directory"] =
     cct->_conf->osd_pool_default_erasure_code_directory;
   set_erasure_code_profile("default", erasure_code_profile_map);
-
-  map<string,string>::const_iterator plugin =
-    erasure_code_profile_map.find("plugin");
-  if (plugin == erasure_code_profile_map.end()) {
-    ss << "cannot determine the erasure code plugin"
-       << " because there is no 'plugin' entry in the erasure_code_profile "
-       << erasure_code_profile_map;
-    return -EINVAL;
-  }
-  ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
-  ErasureCodeInterfaceRef erasure_code;
-  r = instance.factory(plugin->second, erasure_code_profile_map,
-                      &erasure_code, ss);
-  if (r)
-    return r;
-
-  r = erasure_code->create_ruleset("erasure-code", *crush, &ss);
-  if (r < 0)
-    return r;
-
   return r;
 }
 

diff --git a/src/test/cli/osdmaptool/clobber.t b/src/test/cli/osdmaptool/clobber.t
index 8fd3ff6167c91253b505f0c1186037639263a529..37399fd297f7c443b17351347323f2da1292a8e1 100644 (file)
--- a/src/test/cli/osdmaptool/clobber.t
+++ b/src/test/cli/osdmaptool/clobber.t
@@ -1,4 +1,3 @@
-  $ export CEPH_ARGS="--osd-pool-default-erasure-code-directory=.libs"
   $ osdmaptool --createsimple 3 myosdmap
   osdmaptool: osdmap file 'myosdmap'
   osdmaptool: writing epoch 1 to myosdmap