summaryrefslogtreecommitdiff
path: root/src/messages
diff options
context:
space:
mode:
authorSamuel Just <samuel.just@dreamhost.com>2012-03-02 11:12:56 -0800
committerSamuel Just <samuel.just@dreamhost.com>2012-03-06 11:44:36 -0800
commitb85f7d7b1346034b78623d5f76440d9638e7f526 (patch)
tree13e4034bc15cd47fb55b548102ab580f15c30fc5 /src/messages
parentd8dcb28e50e72830b76004326fcc9a151e367b71 (diff)
downloadceph-b85f7d7b1346034b78623d5f76440d9638e7f526.tar.gz
ReplicatedPG: add omap_header to recovery
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Diffstat (limited to 'src/messages')
-rw-r--r--src/messages/MOSDSubOp.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/messages/MOSDSubOp.h b/src/messages/MOSDSubOp.h
index 0fc18b6644e..a92449a9309 100644
--- a/src/messages/MOSDSubOp.h
+++ b/src/messages/MOSDSubOp.h
@@ -25,7 +25,7 @@
class MOSDSubOp : public Message {
- static const int HEAD_VERSION = 5;
+ static const int HEAD_VERSION = 6;
static const int COMPAT_VERSION = 1;
public:
@@ -81,6 +81,7 @@ public:
ObjectRecoveryProgress current_progress;
map<string,bufferlist> omap_entries;
+ bufferlist omap_header;
virtual void decode_payload() {
bufferlist::iterator p = payload.begin();
@@ -130,6 +131,8 @@ public:
}
if (header.version >= 5)
::decode(omap_entries, p);
+ if (header.version >= 6)
+ ::decode(omap_header, p);
}
virtual void encode_payload(uint64_t features) {
@@ -173,6 +176,7 @@ public:
::encode(recovery_progress, payload);
::encode(current_progress, payload);
::encode(omap_entries, payload);
+ ::encode(omap_header, payload);
}
MOSDSubOp()