From: Sage Weil <sage@newdream.net>
Date: Mon, 2 Mar 2009 17:34:07 +0000 (-0800)
Subject: config: remove osd_rep
X-Git-Tag: v0.7~85
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d3c6a61ca1ad433d658e0d0756f15fd07a75916c;p=ceph.git

config: remove osd_rep

We always use primary copy replication mode.
---

diff --git a/src/config.cc b/src/config.cc
index 5e3c23dd8e9..08eac2e930f 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -387,8 +387,6 @@ md_config_t g_conf = {
   mds_hack_log_expire_for_better_stats: false,
 
   // --- osd ---
-  osd_rep: OSD_REP_PRIMARY,
-
   osd_balance_reads: false,  // send from client to replica
   osd_flash_crowd_iat_threshold: 0,//100,
   osd_flash_crowd_iat_alpha: 0.125,
@@ -760,7 +758,6 @@ void parse_config_file(ConfFile *cf, bool auto_update)
   CF_READ("mds", "dump cache after rejoin", mds_dump_cache_after_rejoin);
   CF_READ("mds", "hack log expire for better stats", mds_hack_log_expire_for_better_stats);
 
-  CF_READ("osd", "rep", osd_rep);
   CF_READ("osd", "balance reads", osd_balance_reads);
   CF_READ("osd", "flash crowd iat threshold", osd_flash_crowd_iat_threshold);
   CF_READ("osd", "flash crowd iat alpha", osd_flash_crowd_iat_alpha);
@@ -1271,14 +1268,6 @@ void parse_config_options(std::vector<const char*>& args, bool open)
     else if ( strcmp(args[i],"--osd_stat_refresh_interval" ) == 0 && isarg)
       g_conf.osd_stat_refresh_interval = atof(args[++i]);
 
-    else if (strcmp(args[i], "--osd_rep") == 0 && isarg) 
-      g_conf.osd_rep = atoi(args[++i]);
-    else if (strcmp(args[i], "--osd_rep_chain") == 0) 
-      g_conf.osd_rep = OSD_REP_CHAIN;
-    else if (strcmp(args[i], "--osd_rep_splay") == 0) 
-      g_conf.osd_rep = OSD_REP_SPLAY;
-    else if (strcmp(args[i], "--osd_rep_primary") == 0) 
-      g_conf.osd_rep = OSD_REP_PRIMARY;
     else if (strcmp(args[i], "--osd_heartbeat_interval") == 0 && isarg) 
       g_conf.osd_heartbeat_interval = atoi(args[++i]);
     else if (strcmp(args[i], "--osd_heartbeat_grace") == 0 && isarg) 
diff --git a/src/config.h b/src/config.h
index f5a48c806dc..4fac7eda50c 100644
--- a/src/config.h
+++ b/src/config.h
@@ -247,8 +247,6 @@ struct md_config_t {
   bool mds_hack_log_expire_for_better_stats;
 
   // osd
-  int   osd_rep;
-
   bool osd_balance_reads;
   int osd_flash_crowd_iat_threshold;  // flash crowd interarrival time threshold in ms
   double osd_flash_crowd_iat_alpha;
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 343c0aa71c1..766e0dcedb6 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -120,8 +120,7 @@ bool ReplicatedPG::preprocess_op(MOSDOp *op, utime_t now)
   pobject_t poid(info.pgid.pool(), 0, oid);
 
   // -- load balance reads --
-  if (is_primary() &&
-      g_conf.osd_rep == OSD_REP_PRIMARY) {
+  if (is_primary()) {
     // -- read on primary+acker ---
     
     // test
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 6d22f2d0a5b..121197fcd3a 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -140,10 +140,7 @@ class Objecter {
     // acker - where i read, and receive acks from
     int acker() {
       if (acting.empty()) return -1;
-      if (g_conf.osd_rep == OSD_REP_PRIMARY)
-        return acting[0];
-      else
-        return acting[acting.size() > 1 ? 1:0];
+      return acting[0];
     }
   };