MOSDSubOp: Add entry for omap recovery

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/messages/MOSDSubOp.h b/src/messages/MOSDSubOp.h
index ed8a2ffc3edaac75924f591ad8f0d7acb563323b..0fc18b6644e02a5381b61b5ef1cde397da7813dd 100644 (file)
--- a/src/messages/MOSDSubOp.h
+++ b/src/messages/MOSDSubOp.h
@@ -25,7 +25,7 @@
 
 class MOSDSubOp : public Message {
 
-  static const int HEAD_VERSION = 4;
+  static const int HEAD_VERSION = 5;
   static const int COMPAT_VERSION = 1;
 
 public:
@@ -80,6 +80,8 @@ public:
   // reflects progress before current push
   ObjectRecoveryProgress current_progress;
 
+  map<string,bufferlist> omap_entries;
+
   virtual void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(map_epoch, p);
@@ -126,6 +128,8 @@ public:
       ::decode(recovery_progress, p);
       ::decode(current_progress, p);
     }
+    if (header.version >= 5)
+      ::decode(omap_entries, p);
   }
 
   virtual void encode_payload(uint64_t features) {
@@ -168,6 +172,7 @@ public:
     ::encode(recovery_info, payload);
     ::encode(recovery_progress, payload);
     ::encode(current_progress, payload);
+    ::encode(omap_entries, payload);
   }
 
   MOSDSubOp()