osd: encode ObjectRecoveryInfo with features

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/messages/MOSDSubOp.h b/src/messages/MOSDSubOp.h
index 373ad5a2f22b48adbb35da217d22bff6bd1688dd..ae5465c3a9f2b4f5243b111d9fdb9aff1d4a5050 100644 (file)
--- a/src/messages/MOSDSubOp.h
+++ b/src/messages/MOSDSubOp.h
@@ -224,7 +224,7 @@ public:
     ::encode(complete, payload);
     ::encode(oloc, payload);
     ::encode(data_included, payload);
-    ::encode(recovery_info, payload);
+    ::encode(recovery_info, payload, features);
     ::encode(recovery_progress, payload);
     ::encode(current_progress, payload);
     ::encode(omap_entries, payload);

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 82a77efcc27e5d9d31d336533b3ff3d890ad0a4a..5c3ee93f305fa1d6bc3a024fd571110ef6d21dc2 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -4936,7 +4936,7 @@ void ObjectRecoveryProgress::dump(Formatter *f) const
   f->dump_string("omap_recovered_to", omap_recovered_to);
 }
 
-void ObjectRecoveryInfo::encode(bufferlist &bl) const
+void ObjectRecoveryInfo::encode(bufferlist &bl, uint64_t features) const
 {
   ENCODE_START(2, 1, bl);
   ::encode(soid, bl);
@@ -5086,7 +5086,7 @@ void PullOp::encode(bufferlist &bl, uint64_t features) const
 {
   ENCODE_START(1, 1, bl);
   ::encode(soid, bl);
-  ::encode(recovery_info, bl);
+  ::encode(recovery_info, bl, features);
   ::encode(recovery_progress, bl);
   ENCODE_FINISH(bl);
 }
@@ -5157,7 +5157,7 @@ void PushOp::encode(bufferlist &bl, uint64_t features) const
   ::encode(omap_header, bl);
   ::encode(omap_entries, bl);
   ::encode(attrset, bl);
-  ::encode(recovery_info, bl);
+  ::encode(recovery_info, bl, features);
   ::encode(after_progress, bl);
   ::encode(before_progress, bl);
   ENCODE_FINISH(bl);

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index e27e47c1088248bfbaa29ef9449f92e9ee1f3ce8..9e82b315f7210e3571691b98dfd207b528edb982 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -3879,12 +3879,12 @@ struct ObjectRecoveryInfo {
   ObjectRecoveryInfo() : size(0) { }
 
   static void generate_test_instances(list<ObjectRecoveryInfo*>& o);
-  void encode(bufferlist &bl) const;
+  void encode(bufferlist &bl, uint64_t features) const;
   void decode(bufferlist::iterator &bl, int64_t pool = -1);
   ostream &print(ostream &out) const;
   void dump(Formatter *f) const;
 };
-WRITE_CLASS_ENCODER(ObjectRecoveryInfo)
+WRITE_CLASS_ENCODER_FEATURES(ObjectRecoveryInfo)
 ostream& operator<<(ostream& out, const ObjectRecoveryInfo &inf);
 
 struct ObjectRecoveryProgress {

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index 331444e62e925cd38c7325b9d982d815bd4b52b7..15baa81a27bf6cd117d01dd2366f49459ced1937 100644 (file)
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -80,7 +80,7 @@ TYPE(pg_create_t)
 TYPE(watch_info_t)
 TYPE(object_info_t)
 TYPE(SnapSet)
-TYPE(ObjectRecoveryInfo)
+TYPE_FEATUREFUL(ObjectRecoveryInfo)
 TYPE(ObjectRecoveryProgress)
 TYPE(ScrubMap::object)
 TYPE(ScrubMap)