From f54d8fd96895e5cfed5d15e2b5917b32656fcbf9 Mon Sep 17 00:00:00 2001 From: "nmordech@redhat.com" Date: Mon, 4 Mar 2024 13:34:39 +0000 Subject: [PATCH] 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 (cherry picked from commit 6cddadffcd2f482930b5fae19ca12c37be458df3) --- PendingReleaseNotes | 2 ++ src/crimson/osd/objclass.cc | 11 ----------- src/objclass/objclass.h | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index f79e7540c0d96..bd84ad51c729b 100644 --- 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 : journal reset' and 'cephfs-journal-tool --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 4cc9d73369d67..e62d96c16b382 100644 --- 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 &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 *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 9dbc2bc6ae3db..fdb900616245b 100644 --- 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 &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 *results); -- 2.39.5