msgs: clean up v in message prints

diff --git a/src/TODO b/src/TODO
index 471440cb72357bff8465b414d9a90e14de616a84..a0aa9bff7c2de3797acc6115f337e556517330f8 100644 (file)
--- 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 0b2664205469f840db6735a5054959225973d5de..78aaaf1de4315d74e205d406bf423f3b47b04ea4 100644 (file)
--- 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 40c38fa011fe08deb9d37f8db31b7fcf3e588167..eb85cbfa70309860f9769db40eab4dc2f52ac756 100644 (file)
--- 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 ec0d27ed2165752c9d75c8ff9730952b17b2060a..c7473bde7453223f22dd8ca37109fc3383ce248a 100644 (file)
--- 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 6849bd17b371517c8b63c101f144840126d027b9..d3c12c5835982dad0a87f88dc70532c35a2dc3fc 100644 (file)
--- 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 5497acb2aa98dee7c3ea7d283d699a57bd6184b1..98e28f1d81e5654e6a5ef46197ce3f88b9f13a17 100644 (file)
--- 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 b815d9cd5398d88d32dc75e3e798506fcd255a3d..8d135b1033380078d9531fe282e74de32312821f 100644 (file)
--- 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 0df02e2e8ca513eb61be7519deb661432d83b6f8..ca4ad0700929984902f6de3e50cff0a85cfcfac0 100644 (file)
--- 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 89c67c7a032c13d350ddfbc78cd3f840eff2a381..8c520f80ba02c0ff563401eb3e53872c0a22c421 100644 (file)
--- 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 e0ac5a1b7abac74ac9b7e13a5bf244cfa82e35be..eb29e6cecfdb4c56a2db5b3829da4a7d92676aef 100644 (file)
--- 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 806707b30145984ef3ab1994590a6bebd491b42e..d3dc47b045db1d42a65935e00c60add77836b93b 100644 (file)
--- 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 be6d716203cacdbb9b6824b0312f8aaf8b62b956..2fd9459c3e99bb842759f0c0430ab37c8694bc0e 100644 (file)
--- 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 63ccf81641e404854b8a0d067803b12004c5ae2d..eb55e6872f9974cae7d006861f2f2dbd08d2150c 100644 (file)
--- 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 253520c695573a6792ae5f1b707c01339ad51ea7..760d3ac6cafcceaf7929fff9ca95b09dde7d0ca6 100644 (file)
--- 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() {