From: Sage Weil <sage@newdream.net>
Date: Fri, 26 Jun 2009 22:32:29 +0000 (-0700)
Subject: msgs: clean up v in message prints
X-Git-Tag: v0.10~110
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b39f45e604575256e0807ab6fdcb3816f5284b2;p=ceph.git

msgs: clean up v in message prints
---

diff --git a/src/TODO b/src/TODO
index 471440cb723..a0aa9bff7c2 100644
--- a/src/TODO
+++ b/src/TODO
@@ -30,7 +30,6 @@ v0.10
 /- fix rados snaps vs 'ls'
 /- improved monitor read model
 - osd bugfixes
-- make monclient less sucky on startup
 
 bugs
 
diff --git a/src/messages/MGetPoolStats.h b/src/messages/MGetPoolStats.h
index 0b266420546..78aaaf1de43 100644
--- a/src/messages/MGetPoolStats.h
+++ b/src/messages/MGetPoolStats.h
@@ -31,7 +31,7 @@ public:
 
   const char *get_type_name() { return "getpoolstats"; }
   void print(ostream& out) {
-    out << "getpoolstats(" << tid << " " << pools << "v " << version << ")";
+    out << "getpoolstats(" << tid << " " << pools << " v" << version << ")";
   }
 
   void encode_payload() {
diff --git a/src/messages/MGetPoolStatsReply.h b/src/messages/MGetPoolStatsReply.h
index 40c38fa011f..eb85cbfa703 100644
--- a/src/messages/MGetPoolStatsReply.h
+++ b/src/messages/MGetPoolStatsReply.h
@@ -29,7 +29,7 @@ public:
 
   const char *get_type_name() { return "getpoolstats"; }
   void print(ostream& out) {
-    out << "getpoolstatsreply(" << tid << "v " << version <<  ")";
+    out << "getpoolstatsreply(" << tid << " v" << version <<  ")";
   }
 
   void encode_payload() {
diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h
index ec0d27ed216..c7473bde745 100644
--- a/src/messages/MMDSBeacon.h
+++ b/src/messages/MMDSBeacon.h
@@ -51,7 +51,7 @@ class MMDSBeacon : public PaxosServiceMessage {
 
   void print(ostream& out) {
     out << "mdsbeacon(" << name << " " << ceph_mds_state_name(state) 
-	<< " seq " << seq << "v " << version << ")";
+	<< " seq " << seq << " v" << version << ")";
   }
 
   void encode_payload() {
diff --git a/src/messages/MMonCommandAck.h b/src/messages/MMonCommandAck.h
index 6849bd17b37..d3c12c58359 100644
--- a/src/messages/MMonCommandAck.h
+++ b/src/messages/MMonCommandAck.h
@@ -30,7 +30,7 @@ class MMonCommandAck : public PaxosServiceMessage {
   
   const char *get_type_name() { return "mon_command"; }
   void print(ostream& o) {
-    o << "mon_command_ack(" << cmd << "=" << r << " " << rs << "v " << version << ")";
+    o << "mon_command_ack(" << cmd << "=" << r << " " << rs << " v" << version << ")";
   }
   
   void encode_payload() {
diff --git a/src/messages/MMonObserveNotify.h b/src/messages/MMonObserveNotify.h
index 5497acb2aa9..98e28f1d81e 100644
--- a/src/messages/MMonObserveNotify.h
+++ b/src/messages/MMonObserveNotify.h
@@ -35,7 +35,7 @@ class MMonObserveNotify : public PaxosServiceMessage {
     o << "mon_observe_notify(v" << ver << " " << bl.length() << " bytes";
     if (is_latest)
       o << " latest";
-    o << "v " << version << ")";
+    o << " v" << version << ")";
   }
   
   void encode_payload() {
diff --git a/src/messages/MOSDAlive.h b/src/messages/MOSDAlive.h
index b815d9cd539..8d135b10333 100644
--- a/src/messages/MOSDAlive.h
+++ b/src/messages/MOSDAlive.h
@@ -38,7 +38,7 @@ class MOSDAlive : public PaxosServiceMessage {
 
   const char *get_type_name() { return "osd_alive"; }
   void print(ostream &out) {
-    out << "osd_alive(" << map_epoch << "v " << version << ")";
+    out << "osd_alive(" << map_epoch << " v" << version << ")";
   }
   
 };
diff --git a/src/messages/MOSDBoot.h b/src/messages/MOSDBoot.h
index 0df02e2e8ca..ca4ad070092 100644
--- a/src/messages/MOSDBoot.h
+++ b/src/messages/MOSDBoot.h
@@ -31,7 +31,7 @@ class MOSDBoot : public PaxosServiceMessage {
 
   const char *get_type_name() { return "osd_boot"; }
   void print(ostream& out) {
-    out << "osd_boot(osd" << sb.whoami << "v " << version << ")";
+    out << "osd_boot(osd" << sb.whoami << " v" << version << ")";
   }
   
   void encode_payload() {
diff --git a/src/messages/MOSDFailure.h b/src/messages/MOSDFailure.h
index 89c67c7a032..8c520f80ba0 100644
--- a/src/messages/MOSDFailure.h
+++ b/src/messages/MOSDFailure.h
@@ -49,7 +49,7 @@ class MOSDFailure : public PaxosServiceMessage {
 
   const char *get_type_name() { return "osd_failure"; }
   void print(ostream& out) {
-    out << "osd_failure(" << failed << " e" << epoch << "v " << version << ")";
+    out << "osd_failure(" << failed << " e" << epoch << " v" << version << ")";
   }
 };
 
diff --git a/src/messages/MOSDGetMap.h b/src/messages/MOSDGetMap.h
index e0ac5a1b7ab..eb29e6cecfd 100644
--- a/src/messages/MOSDGetMap.h
+++ b/src/messages/MOSDGetMap.h
@@ -33,8 +33,7 @@ class MOSDGetMap : public PaxosServiceMessage {
 
   const char *get_type_name() { return "get_osd_map"; }
   void print(ostream& out) {
-    out << "get_osd_map(start " << start;
-    out << "v " << version << ")";
+    out << "get_osd_map(start " << start << ")";
   }
   
   void encode_payload() {
diff --git a/src/messages/MPoolSnap.h b/src/messages/MPoolSnap.h
index 806707b3014..d3dc47b045d 100644
--- a/src/messages/MPoolSnap.h
+++ b/src/messages/MPoolSnap.h
@@ -32,7 +32,7 @@ public:
 
   const char *get_type_name() { return "poolsnap"; }
   void print(ostream& out) {
-    out << "poolsnap(" << tid << " " << name << "v " << version << ")";
+    out << "poolsnap(" << tid << " " << name << " v" << version << ")";
   }
 
   void encode_payload() {
diff --git a/src/messages/MPoolSnapReply.h b/src/messages/MPoolSnapReply.h
index be6d716203c..2fd9459c3e9 100644
--- a/src/messages/MPoolSnapReply.h
+++ b/src/messages/MPoolSnapReply.h
@@ -31,7 +31,7 @@ public:
   const char *get_type_name() { return "poolsnapreply"; }
 
   void print(ostream& out) {
-    out << "poolsnapreply(" << tid << "v " << version << ")";
+    out << "poolsnapreply(" << tid << " v" << version << ")";
   }
 
   void encode_payload() {
diff --git a/src/messages/MRemoveSnaps.h b/src/messages/MRemoveSnaps.h
index 63ccf81641e..eb55e6872f9 100644
--- a/src/messages/MRemoveSnaps.h
+++ b/src/messages/MRemoveSnaps.h
@@ -29,7 +29,7 @@ struct MRemoveSnaps : public PaxosServiceMessage {
 
   const char *get_type_name() { return "remove_snaps"; }
   void print(ostream& out) {
-    out << "remove_snaps(" << snaps << "v " << version << ")";
+    out << "remove_snaps(" << snaps << " v" << version << ")";
   }
 
   void encode_payload() {
diff --git a/src/messages/MStatfs.h b/src/messages/MStatfs.h
index 253520c6955..760d3ac6caf 100644
--- a/src/messages/MStatfs.h
+++ b/src/messages/MStatfs.h
@@ -30,7 +30,7 @@ public:
 
   const char *get_type_name() { return "statfs"; }
   void print(ostream& out) {
-    out << "statfs(" << tid << "v " << version << ")";
+    out << "statfs(" << tid << " v" << version << ")";
   }
 
   void encode_payload() {