Merge pull request #10843 from liewegas/wip-osdmap-reencode

messages/MOSDMap: mark as enlighten OSDMap encoder

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

src/messages/MOSDMap.h

@@ -109,17 +109,17 @@ class MOSDMap : public Message {
 	  OSDMap m;
 	  m.decode(inc.fullmap);
 	  inc.fullmap.clear();
-	  m.encode(inc.fullmap, features);
+	  m.encode(inc.fullmap, features | CEPH_FEATURE_RESERVED);
 	}
-	inc.encode(p->second, features);
+	inc.encode(p->second, features | CEPH_FEATURE_RESERVED);
       }
       for (map<epoch_t,bufferlist>::iterator p = maps.begin();
 	   p != maps.end();
 	   ++p) {
 	OSDMap m;
 	m.decode(p->second);
 	p->second.clear();
-	m.encode(p->second, features);
+	m.encode(p->second, features | CEPH_FEATURE_RESERVED);
       }
     }
     ::encode(incremental_maps, payload);