From: Sage Weil <sage@newdream.net>
Date: Thu, 17 Nov 2011 22:10:34 +0000 (-0800)
Subject: paxos: store stashed state _and_ incrementals
X-Git-Tag: v0.39~42
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=367ab142d7bc938c5a8b40027acd2431a11c8022;p=ceph.git

paxos: store stashed state _and_ incrementals

Paxos::share_state() may share a stashed state and incrementals that
follow; we need to store the same.

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

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index 05a00038e4e..0a68fb0537b 100644
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -199,7 +199,6 @@ void Paxos::store_state(MMonPaxos *m)
     first_committed = last_committed;
     mon->store->put_int(first_committed, machine_name, "first_committed");
     mon->store->put_int(last_committed, machine_name, "last_committed");
-    return;
   }
 
   // build map of values to store