Merge pull request ceph#55923 from NitzanMordhai/wip-nitzan-add-depre…

…cate-cls-gather objclass: deprecate cls_cxx_gather
StevenBH · May 13, 2024 · 6d36b0d · 6d36b0d
2 parents 0f060f6 + 0928f7b
commit 6d36b0d
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 171 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/qa/workunits/rados/test.sh b/qa/workunits/rados/test.sh
@@ -36,7 +36,6 @@ for f in \
     api_service api_service_pp \
     api_c_write_operations \
     api_c_read_operations \
-    api_cls_remote_reads \
     list_parallel \
     open_pools_parallel \
     delete_pools_parallel

diff --git a/src/cls/CMakeLists.txt b/src/cls/CMakeLists.txt
@@ -363,12 +363,4 @@ set_target_properties(cls_fifo PROPERTIES
 target_link_libraries(cls_fifo ${FMT_LIB})
 install(TARGETS cls_fifo DESTINATION ${cls_dir})
 
-# cls_test_remote_reads
-set(cls_test_remote_reads_srcs test_remote_reads/cls_test_remote_reads.cc)
-add_library(cls_test_remote_reads SHARED ${cls_test_remote_reads_srcs})
-set_target_properties(cls_test_remote_reads PROPERTIES
-  VERSION "1.0.0"
-  SOVERSION "1"
-  INSTALL_RPATH ""
-  CXX_VISIBILITY_PRESET hidden)
-install(TARGETS cls_test_remote_reads DESTINATION ${cls_dir})
+
diff --git a/src/cls/test_remote_reads/cls_test_remote_reads.cc b/src/cls/test_remote_reads/cls_test_remote_reads.cc
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);
 

diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
@@ -152,12 +152,6 @@ add_executable(ceph_test_rados_api_snapshots_stats_pp
 target_link_libraries(ceph_test_rados_api_snapshots_stats_pp
   librados ${UNITTEST_LIBS} radostest-cxx)
 
-add_executable(ceph_test_rados_api_cls_remote_reads
-  cls_remote_reads.cc
-  $<TARGET_OBJECTS:unit-main>)
-target_link_libraries(ceph_test_rados_api_cls_remote_reads
-  librados global ${UNITTEST_LIBS} radostest-cxx)
-
 install(TARGETS
   ceph_test_rados_api_aio
   ceph_test_rados_api_aio_pp
@@ -183,7 +177,6 @@ install(TARGETS
   ceph_test_rados_api_tier_pp
   ceph_test_rados_api_watch_notify
   ceph_test_rados_api_watch_notify_pp
-  ceph_test_rados_api_cls_remote_reads
   DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 # unittest_librados

diff --git a/src/test/librados/cls_remote_reads.cc b/src/test/librados/cls_remote_reads.cc