osd: add CATEGORIES incompat feature

Care should be taken to upgrade the monitors first, then osds.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index df6a4c8c4339865d20e3834d759bd44ad5b785ef..56094f84421c6a8a0c3ad4617771f1d2ffc84ecb 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -120,6 +120,7 @@ const struct CompatSet::Feature ceph_osd_feature_incompat[] = {
   CEPH_OSD_FEATURE_INCOMPAT_PGINFO,
   CEPH_OSD_FEATURE_INCOMPAT_OLOC,
   CEPH_OSD_FEATURE_INCOMPAT_LEC,
+  CEPH_OSD_FEATURE_INCOMPAT_CATEGORIES, // stat categories
   END_FEATURE
 };
 const struct CompatSet::Feature ceph_osd_feature_ro_compat[] = {

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 70f6885b2e8c55fe511a514ce59d2db1f7cf25ae..f10cd0638de3d603349c259a942acdec04394154 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -33,6 +33,7 @@
 #define CEPH_OSD_FEATURE_INCOMPAT_PGINFO CompatSet::Feature(2, "pginfo object")
 #define CEPH_OSD_FEATURE_INCOMPAT_OLOC CompatSet::Feature(3, "object locator")
 #define CEPH_OSD_FEATURE_INCOMPAT_LEC  CompatSet::Feature(4, "last_epoch_clean")
+#define CEPH_OSD_FEATURE_INCOMPAT_CATEGORIES  CompatSet::Feature(5, "categories")
 
 
 /* osdreqid_t - caller name + incarnation# + tid to unique identify this request