objclass: deprecate cls_cxx_gather

cls_cxx_gather is not maintained and having issues with retry.
since there is no current use of it, we will deprecate it.

Fixes: https://tracker.ceph.com/issues/64258
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
(cherry picked from commit 6cddadffcd2f482930b5fae19ca12c37be458df3)

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index f79e7540c0d962dde451bd9c67f0d77e95410beb..bd84ad51c729bb5b961bb43033a31baa025f50aa 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -188,6 +188,7 @@
   on root inode, which then will restore layout to default layout.
 
 * cls_cxx_gather is marked as deprecated.
+
 * CephFS: cephfs-journal-tool is guarded against running on an online file system.
   The 'cephfs-journal-tool --rank <fs_name>:<mds_rank> journal reset' and
   'cephfs-journal-tool --rank <fs_name>:<mds_rank> journal reset --force'
@@ -209,6 +210,7 @@ CephFS: Disallow delegating preallocated inode ranges to clients. Config
   in the kclient.
 * S3 Get/HeadObject now support query parameter `partNumber` to read a specific
   part of a completed multipart upload.
+* cls_cxx_gather is marked as deprecated.
 
 >=18.0.0
 

diff --git a/src/crimson/osd/objclass.cc b/src/crimson/osd/objclass.cc
index 4cc9d73369d674f676a0aa975de05e9439bc516c..e62d96c16b3828b6d263a11dfa74c1bb0f0cdde0 100644 (file)
--- a/src/crimson/osd/objclass.cc
+++ b/src/crimson/osd/objclass.cc
@@ -552,17 +552,6 @@ uint64_t cls_get_osd_min_alloc_size(cls_method_context_t hctx) {
   return 4096;
 }
 
-int cls_cxx_gather(cls_method_context_t hctx, const std::set<std::string> &src_objs, const std::string& pool,
-                  const char *cls, const char *method, bufferlist& inbl)
-{
-  return 0;
-}
-
-int cls_cxx_get_gathered_data(cls_method_context_t hctx, std::map<std::string, bufferlist> *results)
-{
-  return 0;
-}
-
 // although at first glance the implementation looks the same as in
 // the classical OSD, it's different b/c of how the dout macro expands.
 int cls_log(int level, const char *format, ...)

diff --git a/src/objclass/objclass.h b/src/objclass/objclass.h
index 9dbc2bc6ae3db09d4291a92af3d13dc3c6b35ccb..fdb900616245b46ea685120d48c13f23da4ab372 100644 (file)
--- a/src/objclass/objclass.h
+++ b/src/objclass/objclass.h
@@ -153,7 +153,7 @@ extern int cls_get_snapset_seq(cls_method_context_t hctx, uint64_t *snap_seq);
 
 /* gather */
 extern int cls_cxx_gather(cls_method_context_t hctx, const std::set<std::string> &src_objs, const std::string& pool,
-                         const char *cls, const char *method, bufferlist& inbl);
+                         const char *cls, const char *method, bufferlist& inbl) __attribute__ ((deprecated));
 
 extern int cls_cxx_get_gathered_data(cls_method_context_t hctx, std::map<std::string, bufferlist> *results);