config: remove some old cruft

diff --git a/src/config.cc b/src/config.cc
index 3a1abbdc60adf6d50f684387ed93cbfe634feeea..354873fcb193983ae1519dc2a6f410656cfe71f2 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -172,8 +172,6 @@ const char *get_pool_name(int pool)
 
 // fake osd failures: osd -> time
 std::map<entity_name_t,float> g_fake_kill_after;
-std::map<int,float> g_fake_osd_down;
-std::map<int,float> g_fake_osd_out;
 
 entity_addr_t g_my_addr;
 
@@ -207,11 +205,6 @@ md_config_t g_conf = {
   fake_clock: false,
   fakemessenger_serialize: true,
 
-  fake_osdmap_expand: 0,
-  fake_osdmap_updates: 0,
-  fake_osd_mttf: 0,
-  fake_osd_mttr: 0,
-
   osd_remount_at: 0,
 
   kill_after: 0,
@@ -652,15 +645,6 @@ void parse_config_options(std::vector<const char*>& args, bool open)
     else if (strcmp(args[i], "--mkfs") == 0) 
       g_conf.osd_mkfs = g_conf.mkfs = 1; //atoi(args[++i]);
 
-    else if (strcmp(args[i], "--fake_osdmap_expand") == 0) 
-      g_conf.fake_osdmap_expand = atoi(args[++i]);
-    else if (strcmp(args[i], "--fake_osdmap_updates") == 0) 
-      g_conf.fake_osdmap_updates = atoi(args[++i]);
-    else if (strcmp(args[i], "--fake_osd_mttf") == 0) 
-      g_conf.fake_osd_mttf = atoi(args[++i]);
-    else if (strcmp(args[i], "--fake_osd_mttr") == 0) 
-      g_conf.fake_osd_mttr = atoi(args[++i]);
-
     else if (strcmp(args[i], "--fake_kill_osd_after") == 0) {
       g_fake_kill_after[entity_name_t(entity_name_t::TYPE_OSD, atoi(args[i+1]))] = atof(args[i+2]); 
       i += 2;
@@ -678,16 +662,6 @@ void parse_config_options(std::vector<const char*>& args, bool open)
       i += 2;
     }
 
-    else if (strcmp(args[i], "--fake_osd_down") == 0) {
-      int osd = atoi(args[++i]);
-      float when = atof(args[++i]);
-      g_fake_osd_down[osd] = when;
-    }
-    else if (strcmp(args[i], "--fake_osd_out") == 0) {
-      int osd = atoi(args[++i]);
-      float when = atof(args[++i]);
-      g_fake_osd_out[osd] = when;
-    }
     else if (strcmp(args[i], "--osd_remount_at") == 0) 
       g_conf.osd_remount_at = atoi(args[++i]);
     //else if (strcmp(args[i], "--fake_osd_sync") == 0) 

diff --git a/src/config.h b/src/config.h
index 1f3087df5f1d4dc0eca8a9a273b78a87c6930c17..84e46cd85400edd90c6ad92abcc600788d3271c3 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -30,9 +30,6 @@ extern const char *get_pool_name(int pool);
 
 #include "common/Mutex.h"
 
-extern std::map<int,float> g_fake_osd_down;
-extern std::map<int,float> g_fake_osd_out;
-
 #define OSD_REP_PRIMARY 0
 #define OSD_REP_SPLAY   1
 #define OSD_REP_CHAIN   2
@@ -70,11 +67,6 @@ struct md_config_t {
   bool fake_clock;
   bool fakemessenger_serialize;
 
-  int fake_osdmap_expand;
-  int fake_osdmap_updates;
-  int fake_osd_mttf;
-  int fake_osd_mttr;
-
   int osd_remount_at;
 
   int kill_after;