mon: PaxosService: remove lingering uses of paxos getters and wait methods

We should use the PaxosServices getters, setters, and wait methods when and
wherever possible.  These must have fallen through the cracks during the
merge.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>

diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index 84639315c789705a7e83cb31249f23ba61071898..1f5dafd0f019648e98b7dbac718efb2c45e8b0d4 100644 (file)
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -306,7 +306,7 @@ bool LogMonitor::prepare_log(MLog *m)
 
     }
   }
-  paxos->wait_for_commit(new C_Log(this, m));
+  wait_for_finished_proposal(new C_Log(this, m));
   return true;
 }
 
@@ -491,7 +491,7 @@ void LogMonitor::_create_sub_incremental(MLog *mlog, int level, version_t sv)
   version_t summary_ver = summary.version;
   while (sv <= summary_ver) {
     bufferlist bl;
-    bool success = paxos->read(sv, bl);
+    bool success = get_version(sv, bl);
     assert(success);
     bufferlist::iterator p = bl.begin();
     __u8 v;

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 11dcee2e64b05615a14cb7ba78cc5d9064eb3ff0..3482dfe48d04fcb1ec94247612bbccde6171839e 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -458,7 +458,7 @@ bool MDSMonitor::prepare_beacon(MMDSBeacon *m)
   dout(7) << "prepare_beacon pending map now:" << dendl;
   print_map(pending_mdsmap);
   
-  paxos->wait_for_commit(new C_Updated(this, m));
+  wait_for_finished_proposal(new C_Updated(this, m));
 
   return true;
 }
@@ -826,7 +826,7 @@ bool MDSMonitor::prepare_command(MMonCommand *m)
        map.epoch = pending_mdsmap.epoch;  // make sure epoch is correct
        pending_mdsmap = map;
        string rs = "set mds map";
-       paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, get_version()));
+       wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
        return true;
       } else
        ss << "next mdsmap epoch " << pending_mdsmap.epoch << " != " << e;
@@ -848,7 +848,7 @@ bool MDSMonitor::prepare_command(MMonCommand *m)
        ss << "set mds gid " << gid << " to state " << state << " " << ceph_mds_state_name(state);
        string rs;
        getline(ss, rs);
-       paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, get_version()));
+       wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
        return true;
       }
     }
@@ -873,7 +873,7 @@ bool MDSMonitor::prepare_command(MMonCommand *m)
        ss << "removed mds gid " << gid;
        string rs;
        getline(ss, rs);
-       paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, get_version()));
+       wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
        return true;
       }
     }
@@ -886,7 +886,7 @@ bool MDSMonitor::prepare_command(MMonCommand *m)
       ss << "removed failed mds." << w;
       string rs;
       getline(ss, rs);
-      paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, get_version()));
+      wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
       return true;
     }
     else if (m->cmd[1] == "cluster_fail") {
@@ -967,7 +967,7 @@ bool MDSMonitor::prepare_command(MMonCommand *m)
        ss << "new fs with metadata pool " << metadata << " and data pool " << data;
        string rs;
        getline(ss, rs);
-       paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, get_version()));
+       wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
        return true;
       }
     }    
@@ -980,7 +980,7 @@ bool MDSMonitor::prepare_command(MMonCommand *m)
 
   if (r >= 0) {
     // success.. delay reply
-    paxos->wait_for_commit(new Monitor::C_Command(mon, m, r, rs, get_version()));
+    wait_for_finished_proposal(new Monitor::C_Command(mon, m, r, rs, get_version()));
     return true;
   } else {
     // reply immediately

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 7586edc456e03c70f3a326ae9c90c694834e93f8..392d724f71cbf6dd1949bdd6bc647b60f0a5e9e9 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -393,7 +393,7 @@ bool MonmapMonitor::prepare_command(MMonCommand *m)
       pending_map.last_changed = ceph_clock_now(g_ceph_context);
       ss << "added mon." << name << " at " << addr;
       getline(ss, rs);
-      paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, get_version()));
+      wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
       return true;
     }
     else if (m->cmd.size() == 3 && m->cmd[1] == "remove") {

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index e56139740cd99dd6b60c96207935f0555ee8e21e..965ec58d9ca1af565dfcde05be43c58578b2edfb 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2534,7 +2534,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
        newcrush.encode(pending_inc.crush);
       }
       getline(ss, rs);
-      paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, paxos->get_version()));
+      wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
       return true;
     }
     else if (m->cmd.size() == 5 &&
@@ -2583,7 +2583,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
        newcrush.encode(pending_inc.crush);
       }
       getline(ss, rs);
-      paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, paxos->get_version()));
+      wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
       return true;
     }
     else if (m->cmd[1] == "setmaxosd" && m->cmd.size() > 2) {

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 8c458d5eb7941175956b3211ab8c31a4fe877e12..14f3e4ba9d70beb198e66e891e0f30d1d50afeca 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -547,7 +547,7 @@ bool PGMonitor::prepare_pg_stats(MPGStats *stats)
     */
   }
   
-  paxos->wait_for_commit(new C_Stats(this, stats, ack));
+  wait_for_finished_proposal(new C_Stats(this, stats, ack));
   return true;
 }
 
@@ -1155,7 +1155,7 @@ bool PGMonitor::prepare_command(MMonCommand *m)
     }
     ss << "pg " << m->cmd[2] << " now creating, ok";
     getline(ss, rs);
-    paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, get_version()));
+    wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
     return true;
   }
   else if (m->cmd.size() > 1 && m->cmd[1] == "set_full_ratio") {
@@ -1171,7 +1171,7 @@ bool PGMonitor::prepare_command(MMonCommand *m)
       goto out;
     }
     pending_inc.full_ratio = n;
-    paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, get_version()));
+    wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
     return true;
   }
   else if (m->cmd.size() > 1 && m->cmd[1] == "set_nearfull_ratio") {
@@ -1187,7 +1187,7 @@ bool PGMonitor::prepare_command(MMonCommand *m)
       goto out;
     }
     pending_inc.nearfull_ratio = n;
-    paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, get_version()));
+    wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
     return true;
   }