From 5c0c5b4927d09c56da492c72dc0a49c2fab07155 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 25 Oct 2017 21:55:55 -0500 Subject: [PATCH] include/ceph_features: define RECOVERY_RESERVATION_2 This will allow us to backport support for reservation preemption and cancellations on the wire. Signed-off-by: Sage Weil --- src/include/ceph_features.h | 3 ++- src/messages/MBackfillReserve.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 488700a47c9..5dcc24a85d3 100644 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -107,7 +107,7 @@ DEFINE_CEPH_FEATURE_RETIRED(22, 1, BACKFILL_RESERVATION, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE(23, 1, MSG_AUTH) DEFINE_CEPH_FEATURE_RETIRED(24, 1, RECOVERY_RESERVATION, JEWEL, LUNINOUS) - +DEFINE_CEPH_FEATURE(24, 2, RECOVERY_RESERVATION_2) DEFINE_CEPH_FEATURE(25, 1, CRUSH_TUNABLES2) DEFINE_CEPH_FEATURE(26, 1, CREATEPOOLID) DEFINE_CEPH_FEATURE(27, 1, REPLY_CREATE_INODE) @@ -232,6 +232,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin CEPH_FEATURE_RADOS_BACKOFF | \ CEPH_FEATURE_OSD_RECOVERY_DELETES | \ CEPH_FEATURE_SERVER_MIMIC | \ + CEPH_FEATURE_RECOVERY_RESERVATION_2 | \ 0ULL) #define CEPH_FEATURES_SUPPORTED_DEFAULT CEPH_FEATURES_ALL diff --git a/src/messages/MBackfillReserve.h b/src/messages/MBackfillReserve.h index 19b5531fb54..d014031953a 100644 --- a/src/messages/MBackfillReserve.h +++ b/src/messages/MBackfillReserve.h @@ -86,7 +86,7 @@ public: } void encode_payload(uint64_t features) override { - if (!HAVE_FEATURE(features, SERVER_MIMIC)) { + if (!HAVE_FEATURE(features, RECOVERY_RESERVATION_2)) { header.version = 3; header.compat_version = 3; ::encode(pgid.pgid, payload); -- 2.39.5