Skip to content

Commit 6cddadf

Browse files
committed
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]>
1 parent 9c8f5bd commit 6cddadf

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

PendingReleaseNotes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ CephFS: Disallow delegating preallocated inode ranges to clients. Config
193193
cluster, MDS_CLIENTS_BROKEN_ROOTSQUASH. See the documentation on this warning
194194
and the new feature bit for more information.
195195

196+
* cls_cxx_gather is marked as deprecated.
196197

197198
>=18.0.0
198199

src/crimson/osd/objclass.cc

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -552,17 +552,6 @@ uint64_t cls_get_osd_min_alloc_size(cls_method_context_t hctx) {
552552
return 4096;
553553
}
554554

555-
int cls_cxx_gather(cls_method_context_t hctx, const std::set<std::string> &src_objs, const std::string& pool,
556-
const char *cls, const char *method, bufferlist& inbl)
557-
{
558-
return 0;
559-
}
560-
561-
int cls_cxx_get_gathered_data(cls_method_context_t hctx, std::map<std::string, bufferlist> *results)
562-
{
563-
return 0;
564-
}
565-
566555
// although at first glance the implementation looks the same as in
567556
// the classical OSD, it's different b/c of how the dout macro expands.
568557
int cls_log(int level, const char *format, ...)

src/objclass/objclass.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ extern int cls_get_snapset_seq(cls_method_context_t hctx, uint64_t *snap_seq);
153153

154154
/* gather */
155155
extern int cls_cxx_gather(cls_method_context_t hctx, const std::set<std::string> &src_objs, const std::string& pool,
156-
const char *cls, const char *method, bufferlist& inbl);
156+
const char *cls, const char *method, bufferlist& inbl) __attribute__ ((deprecated));
157157

158158
extern int cls_cxx_get_gathered_data(cls_method_context_t hctx, std::map<std::string, bufferlist> *results);
159159

0 commit comments

Comments
 (0)