mds: introduce BLOCKDIFF feature bit

Fixes: http://tracker.ceph.com/issues/70584
Signed-off-by: Venky Shankar <vshankar@redhat.com>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index f1f70c1321d81572aceb3a0c249af558ec511bf3..b04900912f91b06128956940f6d1ecabfaa22217 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -9994,7 +9994,7 @@ int Client::file_blockdiff(struct scan_state_t *state, const UserPerm &perms,
     cct->_conf.get_val<uint64_t>("client_file_blockdiff_max_concurrent_object_scans");
 
   bufferlist bl;
-  r = make_request(req, perms, nullptr, nullptr, -1, &bl);
+  r = make_request(req, perms, nullptr, nullptr, -1, &bl, CEPHFS_FEATURE_BLOCKDIFF);
   ldout(cct, 10) << __func__ << ": result=" << r << dendl;
 
   if (r < 0) {

diff --git a/src/mds/cephfs_features.cc b/src/mds/cephfs_features.cc
index edd9b5bc21a80888c3b79f07526b0685d01c86a1..f57f95fc8c8d845494aa8f85090fb504c75ce92c 100644 (file)
--- a/src/mds/cephfs_features.cc
+++ b/src/mds/cephfs_features.cc
@@ -34,6 +34,7 @@ static const std::array feature_names
   "has_owner_uidgid",
   "client_mds_auth_caps",
   "charmap",
+  "blockdiff"
 };
 static_assert(feature_names.size() == CEPHFS_FEATURE_MAX + 1);
 

diff --git a/src/mds/cephfs_features.h b/src/mds/cephfs_features.h
index c681416d626d100e40df92c38dd416da9fc5bfba..391054d8701c12ff301e98a4dcc500c3cbf92bfa 100644 (file)
--- a/src/mds/cephfs_features.h
+++ b/src/mds/cephfs_features.h
@@ -50,7 +50,8 @@ namespace ceph {
 #define CEPHFS_FEATURE_HAS_OWNER_UIDGID     20
 #define CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK  21
 #define CEPHFS_FEATURE_CHARMAP              22
-#define CEPHFS_FEATURE_MAX                  22
+#define CEPHFS_FEATURE_BLOCKDIFF            23
+#define CEPHFS_FEATURE_MAX                  23
 
 #define CEPHFS_FEATURES_ALL {          \
   0, 1, 2, 3, 4,                       \
@@ -73,7 +74,8 @@ namespace ceph {
   CEPHFS_FEATURE_NEW_SNAPREALM_INFO,    \
   CEPHFS_FEATURE_HAS_OWNER_UIDGID,      \
   CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK,   \
-  CEPHFS_FEATURE_CHARMAP,      \
+  CEPHFS_FEATURE_CHARMAP,               \
+  CEPHFS_FEATURE_BLOCKDIFF,             \
 }
 
 #define CEPHFS_METRIC_FEATURES_ALL {           \