mon: fix log state trimming

We need to stash last_consumed in order for trimming to work.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index 8732f57c29c76df1cb5550118c92464a54c1abc5..305be2220eb16184fa8dd4eb58140979768ba524 100644 (file)
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -155,7 +155,7 @@ bool LogMonitor::update_from_paxos()
   bufferlist bl;
   ::encode(summary, bl);
   paxos->stash_latest(paxosv, bl);
- 
+
   if (blog.length())
     mon->store->append_bl_ss(blog, "log", NULL);
   if (blogdebug.length())

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 6d854a4ee45914cb75340220ee1e3913d4242060..8c7b40902ffbfe3ff29c32aebaacf1a7c2488cb3 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -160,7 +160,6 @@ bool PGMonitor::update_from_paxos()
   bufferlist bl;
   pg_map.encode(bl);
   paxos->stash_latest(paxosv, bl);
-  mon->store->put_int(paxosv, "pgmap", "last_consumed");
 
   // dump pgmap summaries?  (useful for debugging)
   if (0) {

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index d44a70e64f80e2c75ee1d76cfd9f7a09e74e14bc..dc89a065c86b43676b3bfb1faced7b310699d010 100644 (file)
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -1001,6 +1001,7 @@ void Paxos::stash_latest(version_t v, bufferlist& bl)
   
   dout(10) << "stash_latest v" << v << " len " << bl.length() << dendl;
   mon->store->put_bl_ss(final, machine_name, "latest");
+  mon->store->put_int(v, machine_name, "last_consumed");
 
   latest_stashed = v;
 }