From: Sage Weil <sage@redhat.com>
Date: Fri, 19 May 2017 15:08:26 +0000 (-0400)
Subject: mon/MgrStatMonitor: trim mgrstat states
X-Git-Tag: ses5-milestone6~8^2~19^2~51
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0d417366f87a01163afcb0ff2c569301a71d040;p=ceph.git

mon/MgrStatMonitor: trim mgrstat states

We don't actually need any of these older states at all so I hard-coded
a constant (oh no!).  In reality it doesn't matter what it is anyway
since PaxosService waits for paxos_service_trim_min (=250) to accumulate
before removing anything.

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

diff --git a/src/mon/MgrStatMonitor.cc b/src/mon/MgrStatMonitor.cc
index a0e14c2460f..ef61c06346a 100644
--- a/src/mon/MgrStatMonitor.cc
+++ b/src/mon/MgrStatMonitor.cc
@@ -118,6 +118,15 @@ void MgrStatMonitor::encode_pending(MonitorDBStore::TransactionRef t)
   put_last_committed(t, version);
 }
 
+version_t MgrStatMonitor::get_trim_to()
+{
+  // we don't actually need *any* old states, but keep a few.
+  if (version > 5) {
+    return version - 5;
+  }
+  return 0;
+}
+
 void MgrStatMonitor::on_active()
 {
 }
diff --git a/src/mon/MgrStatMonitor.h b/src/mon/MgrStatMonitor.h
index 4a613e8c387..e1e02cd4089 100644
--- a/src/mon/MgrStatMonitor.h
+++ b/src/mon/MgrStatMonitor.h
@@ -35,6 +35,7 @@ public:
   void update_from_paxos(bool *need_bootstrap) override;
   void create_pending() override;
   void encode_pending(MonitorDBStore::TransactionRef t) override;
+  version_t get_trim_to() override;
 
   bool preprocess_query(MonOpRequestRef op) override;
   bool prepare_update(MonOpRequestRef op) override;