update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / messages / MMgrConfigure.h

diff --git a/ceph/src/messages/MMgrConfigure.h b/ceph/src/messages/MMgrConfigure.h
index aaa36790a4c06b474585dd60b5d7ccbfe2ac39e0..7b27c9064eb37899283e8000c9772449ecffd961 100644 (file)
--- a/ceph/src/messages/MMgrConfigure.h
+++ b/ceph/src/messages/MMgrConfigure.h
@@ -59,7 +59,12 @@ public:
     encode(stats_period, payload);
     encode(stats_threshold, payload);
     encode(osd_perf_metric_queries, payload);
-    encode(metric_config_message, payload);
+    if (metric_config_message && metric_config_message->should_encode(features)) {
+      encode(metric_config_message, payload);
+    } else {
+      boost::optional<MetricConfigMessage> empty;
+      encode(empty, payload);
+    }
   }
 
   std::string_view get_type_name() const override { return "mgrconfigure"; }