Merge branch 'wip-pg-creation'

4 files changed, 29 insertions, 2 deletions

diff --git a/src/messages/MOSDPGCreate.h b/src/messages/MOSDPGCreate.h
index b006be56b6b..9b744d9c90c 100644
--- a/src/messages/MOSDPGCreate.h
+++ b/src/messages/MOSDPGCreate.h
@@ -63,6 +63,16 @@ public:
     ::decode(epoch, p);
     ::decode(mkpg, p);
   }
+
+  void print(ostream& out) {
+    out << "osd pg create(";
+    for (map<pg_t,create_rec>::iterator i = mkpg.begin();
+         i != mkpg.end();
+         ++i) {
+      out << "pg" << i->first << "," << i->second.created << "; ";
+    }
+    out << ")";
+  }
 };
 
 WRITE_CLASS_ENCODER(MOSDPGCreate::create_rec)
diff --git a/src/messages/MOSDPGNotify.h b/src/messages/MOSDPGNotify.h
index 565864de2a7..27279d24bb5 100644
--- a/src/messages/MOSDPGNotify.h
+++ b/src/messages/MOSDPGNotify.h
@@ -52,6 +52,15 @@ public:
     ::decode(epoch, p);
     ::decode(pg_list, p);
   }
+  void print(ostream& out) {
+    out << "osd pg notify(" << "epoch " << epoch << "; ";
+    for (vector<PG::Info>::iterator i = pg_list.begin();
+         i != pg_list.end();
+         ++i) {
+      out << "pg" << i->pgid << "; ";
+    }
+    out << ")";
+  }
 };
 
 #endif
diff --git a/src/messages/MOSDPGRemove.h b/src/messages/MOSDPGRemove.h
index 85177687092..dd2a3f30b8c 100644
--- a/src/messages/MOSDPGRemove.h
+++ b/src/messages/MOSDPGRemove.h
@@ -48,7 +48,15 @@ public:
     ::decode(epoch, p);
     ::decode(pg_list, p);
   }
-
+  void print(ostream& out) {
+    out << "osd pg remove(" << "epoch " << epoch << "; ";
+    for (vector<pg_t>::iterator i = pg_list.begin();
+         i != pg_list.end();
+         ++i) {
+      out << "pg" << *i << "; ";
+    }
+    out << ")";
+  }
 };
 
 #endif
diff --git a/src/messages/MOSDSubOpReply.h b/src/messages/MOSDSubOpReply.h
index 4abccef94f2..e5f7e0229e2 100644
--- a/src/messages/MOSDSubOpReply.h
+++ b/src/messages/MOSDSubOpReply.h
@@ -136,7 +136,7 @@ public:
       out << " onnvram";
     if (ack_type & CEPH_OSD_FLAG_ACK)
       out << " ack";
-    out << " = " << result;
+    out << ", result = " << result;
     out << ")";
   }