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 <[email protected]>
zmc · May 9, 2024 · 6cddadf · 6cddadf
1 parent 9c8f5bd
commit 6cddadf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/PendingReleaseNotes b/PendingReleaseNotes
@@ -193,6 +193,7 @@ CephFS: Disallow delegating preallocated inode ranges to clients. Config
   cluster, MDS_CLIENTS_BROKEN_ROOTSQUASH. See the documentation on this warning
   and the new feature bit for more information.
 
+* cls_cxx_gather is marked as deprecated.
 
 >=18.0.0
 

diff --git 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
@@ -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);