]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/Paxos: put source mon id in a temp variable
authorSage Weil <sage@redhat.com>
Wed, 13 Aug 2014 23:01:01 +0000 (16:01 -0700)
committerSage Weil <sage@redhat.com>
Wed, 13 Aug 2014 23:01:01 +0000 (16:01 -0700)
Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/Paxos.cc

index 3883a3290d1409e9cb871c9b40a36deaae0b8547..90dcde04ed84000e35a64b4fec606db90a03f693 100644 (file)
@@ -385,6 +385,7 @@ void Paxos::_sanity_check_store()
 void Paxos::handle_last(MMonPaxos *last)
 {
   bool need_refresh = false;
+  int from = last->get_source().num();
 
   dout(10) << "handle_last " << *last << dendl;
 
@@ -396,12 +397,13 @@ void Paxos::handle_last(MMonPaxos *last)
 
   // note peer's first_ and last_committed, in case we learn a new
   // commit and need to push it to them.
-  peer_first_committed[last->get_source().num()] = last->first_committed;
-  peer_last_committed[last->get_source().num()] = last->last_committed;
+  peer_first_committed[from] = last->first_committed;
+  peer_last_committed[from] = last->last_committed;
 
   if (last->first_committed > last_committed+1) {
     dout(5) << __func__
-            << " peon's lowest version is too high for our last committed"
+            << " mon." << from
+           << " lowest version is too high for our last committed"
             << " (theirs: " << last->first_committed
             << "; ours: " << last_committed << ") -- bootstrap!" << dendl;
     last->put();