From: Sage Weil <sage@redhat.com>
Date: Tue, 20 Dec 2016 21:01:52 +0000 (-0500)
Subject: mon/MDSMonitor: no need to set crash_replay_interval on data pools
X-Git-Tag: v12.0.0~334^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6fdff4904473e6ae2c6a124673ed2f75231bb77;p=ceph.git

mon/MDSMonitor: no need to set crash_replay_interval on data pools

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

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 43a0bb93b240..c19d7a70d8b9 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -1643,22 +1643,6 @@ int MDSMonitor::management_command(
       return r;
     }
 
-    // Automatically set crash_replay_interval on data pool if it
-    // isn't already set.
-    if (data_pool->get_crash_replay_interval() == 0) {
-      // We will be changing osdmon's state and requesting the osdmon to
-      // propose.  We thus need to make sure the osdmon is writeable before
-      // we do this, waiting if it's not.
-      if (!mon->osdmon()->is_writeable()) {
-        mon->osdmon()->wait_for_writeable(op, new C_RetryMessage(this, op));
-        return -EAGAIN;
-      }
-
-      r = mon->osdmon()->set_crash_replay_interval(data, g_conf->osd_default_data_pool_replay_window);
-      assert(r == 0);  // We just did get_pg_pool so it must exist and be settable
-      request_proposal(mon->osdmon());
-    }
-
     // All checks passed, go ahead and create.
     create_new_fs(pending_fsmap, fs_name, metadata, data);
     ss << "new fs with metadata pool " << metadata << " and data pool " << data;
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 8c6c5fb0fa82..9c62b404648f 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -5125,34 +5125,6 @@ int OSDMonitor::parse_osd_id(const char *s, stringstream *pss)
 }
 
 
-/**
- * Special setter for crash_replay_interval on a pool.  Equivalent to
- * using prepare_command_pool_set, but in a form convenient for use
- * from MDSMonitor rather than from an administrative command.
- */
-int OSDMonitor::set_crash_replay_interval(const int64_t pool_id, const uint32_t cri)
-{
-  pg_pool_t p;
-  if (pending_inc.new_pools.count(pool_id)) {
-    p = pending_inc.new_pools[pool_id];
-  } else {
-    const pg_pool_t *p_ptr = osdmap.get_pg_pool(pool_id);
-    if (p_ptr == NULL) {
-      return -ENOENT;
-    } else {
-      p = *p_ptr;
-    }
-  }
-
-  dout(10) << "Set pool " << pool_id << " crash_replay_interval=" << cri << dendl;
-  p.crash_replay_interval = cri;
-  p.last_change = pending_inc.epoch;
-  pending_inc.new_pools[pool_id] = p;
-
-  return 0;
-}
-
-
 int OSDMonitor::prepare_command_pool_set(map<string,cmd_vartype> &cmdmap,
                                          stringstream& ss)
 {
diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 103806175242..5b354bca8fde 100644
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -411,7 +411,6 @@ private:
   bool prepare_command(MonOpRequestRef op);
   bool prepare_command_impl(MonOpRequestRef op, map<string,cmd_vartype>& cmdmap);
 
-  int set_crash_replay_interval(const int64_t pool_id, const uint32_t cri);
   int prepare_command_pool_set(map<string,cmd_vartype> &cmdmap,
                                stringstream& ss);