Skip to content

Commit 5c05291

Browse files
committed
cls/rgw/client: expose cls_rgw_bucket_init_index2()
Signed-off-by: Casey Bodley <[email protected]>
1 parent 088f5ab commit 5c05291

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/cls/rgw/cls_rgw_client.cc

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ bool BucketIndexAioManager::wait_for_completions(int valid_ret_code,
186186
return true;
187187
}
188188

189-
// note: currently only called by testing code
190189
void cls_rgw_bucket_init_index(ObjectWriteOperation& o)
191190
{
192191
bufferlist in;
@@ -200,18 +199,24 @@ static bool issue_bucket_index_init_op(librados::IoCtx& io_ctx,
200199
bufferlist in;
201200
librados::ObjectWriteOperation op;
202201
op.create(true);
203-
op.exec(RGW_CLASS, RGW_BUCKET_INIT_INDEX, in);
202+
cls_rgw_bucket_init_index(op);
204203
return manager->aio_operate(io_ctx, shard_id, oid, &op);
205204
}
206205

206+
void cls_rgw_bucket_init_index2(ObjectWriteOperation& o)
207+
{
208+
bufferlist in;
209+
o.exec(RGW_CLASS, RGW_BUCKET_INIT_INDEX2, in);
210+
}
211+
207212
static bool issue_bucket_index_init_op2(librados::IoCtx& io_ctx,
208213
const int shard_id,
209214
const string& oid,
210215
BucketIndexAioManager *manager) {
211216
bufferlist in;
212217
librados::ObjectWriteOperation op;
213218
op.create(true);
214-
op.exec(RGW_CLASS, RGW_BUCKET_INIT_INDEX2, in);
219+
cls_rgw_bucket_init_index2(op);
215220
return manager->aio_operate(io_ctx, shard_id, oid, &op);
216221
}
217222

src/cls/rgw/cls_rgw_client.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ class BucketIndexShardsManager {
264264

265265
/* bucket index */
266266
void cls_rgw_bucket_init_index(librados::ObjectWriteOperation& o);
267+
void cls_rgw_bucket_init_index2(librados::ObjectWriteOperation& o);
267268

268269
class CLSRGWConcurrentIO {
269270
protected:

0 commit comments

Comments
 (0)