From 117eb5f423a8ebb3e8fa4f59f44493955eecc022 Mon Sep 17 00:00:00 2001 From: "J. Eric Ivancich" Date: Wed, 7 Nov 2018 15:33:52 -0500 Subject: [PATCH] rgw: rename function for clarity The function cls_rgw_bucket_init was renamed to cls_rgw_bucket_init_index in order to better describe its functionality. Signed-off-by: J. Eric Ivancich (cherry picked from commit 20868bd3b893ba2e17d2bfdc63d6544dbe677a9b) --- src/cls/rgw/cls_rgw_client.cc | 2 +- src/cls/rgw/cls_rgw_client.h | 2 +- src/rgw/rgw_rados.cc | 2 +- src/test/cls_rgw/test_cls_rgw.cc | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cls/rgw/cls_rgw_client.cc b/src/cls/rgw/cls_rgw_client.cc index 4d446dccc8153..3a5423cca6190 100644 --- a/src/cls/rgw/cls_rgw_client.cc +++ b/src/cls/rgw/cls_rgw_client.cc @@ -92,7 +92,7 @@ bool BucketIndexAioManager::wait_for_completions(int valid_ret_code, return true; } -void cls_rgw_bucket_init(ObjectWriteOperation& o) +void cls_rgw_bucket_init_index(ObjectWriteOperation& o) { bufferlist in; o.exec(RGW_CLASS, RGW_BUCKET_INIT_INDEX, in); diff --git a/src/cls/rgw/cls_rgw_client.h b/src/cls/rgw/cls_rgw_client.h index 1f3c1687f0aab..774778619ef10 100644 --- a/src/cls/rgw/cls_rgw_client.h +++ b/src/cls/rgw/cls_rgw_client.h @@ -230,7 +230,7 @@ public: }; /* bucket index */ -void cls_rgw_bucket_init(librados::ObjectWriteOperation& o); +void cls_rgw_bucket_init_index(librados::ObjectWriteOperation& o); class CLSRGWConcurrentIO { protected: diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 8b1141eeff474..005f7779049ef 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -13091,7 +13091,7 @@ bool RGWRados::process_expire_objects() int RGWRados::cls_rgw_init_index(librados::IoCtx& index_ctx, librados::ObjectWriteOperation& op, string& oid) { bufferlist in; - cls_rgw_bucket_init(op); + cls_rgw_bucket_init_index(op); return index_ctx.operate(oid, &op); } diff --git a/src/test/cls_rgw/test_cls_rgw.cc b/src/test/cls_rgw/test_cls_rgw.cc index c97c7e354aa41..f91ff99b7a9c6 100644 --- a/src/test/cls_rgw/test_cls_rgw.cc +++ b/src/test/cls_rgw/test_cls_rgw.cc @@ -116,7 +116,7 @@ TEST(cls_rgw, index_basic) OpMgr mgr; ObjectWriteOperation *op = mgr.write_op(); - cls_rgw_bucket_init(*op); + cls_rgw_bucket_init_index(*op); ASSERT_EQ(0, ioctx.operate(bucket_oid, op)); uint64_t epoch = 1; @@ -150,7 +150,7 @@ TEST(cls_rgw, index_multiple_obj_writers) OpMgr mgr; ObjectWriteOperation *op = mgr.write_op(); - cls_rgw_bucket_init(*op); + cls_rgw_bucket_init_index(*op); ASSERT_EQ(0, ioctx.operate(bucket_oid, op)); uint64_t obj_size = 1024; @@ -187,7 +187,7 @@ TEST(cls_rgw, index_remove_object) OpMgr mgr; ObjectWriteOperation *op = mgr.write_op(); - cls_rgw_bucket_init(*op); + cls_rgw_bucket_init_index(*op); ASSERT_EQ(0, ioctx.operate(bucket_oid, op)); uint64_t obj_size = 1024; @@ -279,7 +279,7 @@ TEST(cls_rgw, index_suggest) OpMgr mgr; ObjectWriteOperation *op = mgr.write_op(); - cls_rgw_bucket_init(*op); + cls_rgw_bucket_init_index(*op); ASSERT_EQ(0, ioctx.operate(bucket_oid, op)); uint64_t total_size = 0; @@ -390,7 +390,7 @@ TEST(cls_rgw, index_list) OpMgr mgr; ObjectWriteOperation *op = mgr.write_op(); - cls_rgw_bucket_init(*op); + cls_rgw_bucket_init_index(*op); ASSERT_EQ(0, ioctx.operate(bucket_oid, op)); uint64_t epoch = 1; @@ -452,7 +452,7 @@ TEST(cls_rgw, bi_list) OpMgr mgr; ObjectWriteOperation *op = mgr.write_op(); - cls_rgw_bucket_init(*op); + cls_rgw_bucket_init_index(*op); ASSERT_EQ(0, ioctx.operate(bucket_oid, op)); string name; -- 2.39.5