From: Josh Durgin Date: Mon, 3 Jul 2017 23:35:02 +0000 (-0400) Subject: osd: add incompat superblock feature for deletes during recovery X-Git-Tag: v12.1.2~220^2~8 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5741d3001a8e49c39bd6ffd300278bcb073516f0;p=ceph.git osd: add incompat superblock feature for deletes during recovery On-disk missing sets would need to be regenerated if downgraded from luminous to kraken. Signed-off-by: Josh Durgin --- diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 1498a691c8a5..2613557f643b 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -187,6 +187,7 @@ CompatSet OSD::get_osd_initial_compat_set() { ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_PGMETA); ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_MISSING); ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_FASTINFO); + ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_RECOVERY_DELETES); return CompatSet(ceph_osd_feature_compat, ceph_osd_feature_ro_compat, ceph_osd_feature_incompat); } diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 18e75e686a8f..87166584f248 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -63,6 +63,7 @@ #define CEPH_OSD_FEATURE_INCOMPAT_PGMETA CompatSet::Feature(13, "pg meta object") #define CEPH_OSD_FEATURE_INCOMPAT_MISSING CompatSet::Feature(14, "explicit missing set") #define CEPH_OSD_FEATURE_INCOMPAT_FASTINFO CompatSet::Feature(15, "fastinfo pg attr") +#define CEPH_OSD_FEATURE_INCOMPAT_RECOVERY_DELETES CompatSet::Feature(16, "deletes in missing set") /// min recovery priority for MBackfillReserve