Revert "erasure-code: create default profile if necessary"

This reverts commit 360de6adf24ef9a1287d169416d5e9bbb72afbec.

Conflicts:
	src/mon/OSDMonitor.cc

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 88572c9cc0bbe8c3537ff345dba2ff350fd8b423..46e47cb223d1f5117ac4a1e1b42095778d71baa6 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4184,23 +4184,8 @@ bool OSDMonitor::prepare_command_impl(MMonCommand *m,
     cmd_getval(g_ceph_context, cmdmap, "name", name);
     string profile;
     cmd_getval(g_ceph_context, cmdmap, "profile", profile);
-    if (profile == "") {
+    if (profile == "")
       profile = "default";
-      if (!osdmap.has_erasure_code_profile(profile)) {
-       if (pending_inc.has_erasure_code_profile(profile))
-         goto wait;
-
-       map<string,string> profile_map;
-       err = osdmap.get_erasure_code_profile_default(g_ceph_context,
-                                                     profile_map,
-                                                     &ss);
-       if (err)
-         goto reply;
-       dout(20) << "erasure code profile " << name << " set" << dendl;
-       pending_inc.set_erasure_code_profile(profile, profile_map);
-       goto wait;
-      }
-    }
 
     int ruleset;
     err = crush_ruleset_create_erasure(name, profile, &ruleset, ss);

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 79759d7d4c02bc9a677b85c61a8ccb3f4d862ff3..8d2a346fb64b8a271aad869b40cdf6e4a062910c 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -2562,25 +2562,13 @@ int OSDMap::build_simple(CephContext *cct, epoch_t e, uuid_d &fsid,
     set_weight(i, CEPH_OSD_OUT);
   }
 
-  map<string,string> profile_map;
-  r = get_erasure_code_profile_default(cct, profile_map, &ss);
-  if (r < 0) {
-    lderr(cct) << ss.str() << dendl;
-    return r;
-  }
-  set_erasure_code_profile("default", profile_map);
-  return 0;
-}
-
-int OSDMap::get_erasure_code_profile_default(CephContext *cct,
-                                            map<string,string> &profile_map,
-                                            ostream *ss)
-{
-  int r = get_str_map(cct->_conf->osd_pool_default_erasure_code_profile,
-                     *ss,
-                     &profile_map);
-  profile_map["directory"] =
+  map<string,string> erasure_code_profile_map;
+  r = get_str_map(cct->_conf->osd_pool_default_erasure_code_profile,
+                 ss,
+                 &erasure_code_profile_map);
+  erasure_code_profile_map["directory"] =
     cct->_conf->osd_pool_default_erasure_code_directory;
+  set_erasure_code_profile("default", erasure_code_profile_map);
   return r;
 }
 

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 42441d1490e23469e1835b635718ae9dee2f3e7c..e3ac29a1107044991193db232dd250d5d3c66da6 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -381,9 +381,6 @@ public:
       erasure_code_profiles.find(name);
     return i != erasure_code_profiles.end();
   }
-  int get_erasure_code_profile_default(CephContext *cct,
-                                      map<string,string> &profile_map,
-                                      ostream *ss);
   void set_erasure_code_profile(const string &name,
                                const map<string,string> &profile) {
     erasure_code_profiles[name] = profile;
@@ -793,8 +790,6 @@ public:
    */
   int build_simple(CephContext *cct, epoch_t e, uuid_d &fsid,
                   int num_osd, int pg_bits, int pgp_bits);
-  int set_erasure_code_profile_default(CephContext *cct);
-
   static int _build_crush_types(CrushWrapper& crush);
   static int build_simple_crush_map(CephContext *cct, CrushWrapper& crush,
                                    int num_osd, ostream *ss);