reorder osd up/down in/out output

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1511 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/branches/sage/cephmds2/mon/OSDMonitor.cc b/branches/sage/cephmds2/mon/OSDMonitor.cc
index 11b2f59d1771df1630a67e6fb634ff68c31d305f..a15888aa1779db8c549664c43cbca79f43d91f8f 100644 (file)
--- a/branches/sage/cephmds2/mon/OSDMonitor.cc
+++ b/branches/sage/cephmds2/mon/OSDMonitor.cc
@@ -289,12 +289,6 @@ void OSDMonitor::encode_pending(bufferlist &bl)
   pending_inc.mon_epoch = mon->mon_epoch;
   
   // tell me about it
-  for (map<int,entity_inst_t>::iterator i = pending_inc.new_up.begin();
-       i != pending_inc.new_up.end(); 
-       i++) { 
-    dout(0) << " osd" << i->first << " UP " << i->second << endl;
-    derr(0) << " osd" << i->first << " UP " << i->second << endl;
-  }
   for (map<int,entity_inst_t>::iterator i = pending_inc.new_down.begin();
        i != pending_inc.new_down.end();
        i++) {
@@ -302,11 +296,11 @@ void OSDMonitor::encode_pending(bufferlist &bl)
     derr(0) << " osd" << i->first << " DOWN " << i->second << endl;
     mon->messenger->mark_down(i->second.addr);
   }
-  for (list<int>::iterator i = pending_inc.new_in.begin();
-       i != pending_inc.new_in.end();
-       i++) {
-    dout(0) << " osd" << *i << " IN" << endl;
-    derr(0) << " osd" << *i << " IN" << endl;
+  for (map<int,entity_inst_t>::iterator i = pending_inc.new_up.begin();
+       i != pending_inc.new_up.end(); 
+       i++) { 
+    dout(0) << " osd" << i->first << " UP " << i->second << endl;
+    derr(0) << " osd" << i->first << " UP " << i->second << endl;
   }
   for (list<int>::iterator i = pending_inc.new_out.begin();
        i != pending_inc.new_out.end();
@@ -314,6 +308,12 @@ void OSDMonitor::encode_pending(bufferlist &bl)
     dout(0) << " osd" << *i << " OUT" << endl;
     derr(0) << " osd" << *i << " OUT" << endl;
   }
+  for (list<int>::iterator i = pending_inc.new_in.begin();
+       i != pending_inc.new_in.end();
+       i++) {
+    dout(0) << " osd" << *i << " IN" << endl;
+    derr(0) << " osd" << *i << " IN" << endl;
+  }
 
   // encode
   assert(paxos->get_version() + 1 == pending_inc.epoch);