From 4c1cb28cb6cbb3d23a1736d02f6af524481c886a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 21 Jun 2011 12:13:04 -0700 Subject: [PATCH] mon: fix log state trimming We need to stash last_consumed in order for trimming to work. Signed-off-by: Sage Weil --- src/mon/LogMonitor.cc | 2 +- src/mon/PGMonitor.cc | 1 - src/mon/Paxos.cc | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc index 8732f57c29c76..305be2220eb16 100644 --- 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 6d854a4ee4591..8c7b40902ffbf 100644 --- 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 d44a70e64f80e..dc89a065c86b4 100644 --- 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; } -- 2.39.5