diff options
| author | Yehuda Sadeh <yehuda@redhat.com> | 2019-06-19 00:31:12 +0200 |
|---|---|---|
| committer | Casey Bodley <cbodley@redhat.com> | 2019-07-29 21:20:49 +0200 |
| commit | 6e7972054dcbc87525dc3c07f8c0a0eee555718b (patch) | |
| tree | 8bd184042aad1497588549557ed147f9464c8787 /src/rgw/rgw_reshard.cc | |
| parent | rgw: meta handler provides shard id info of meta key (diff) | |
| download | ceph-6e7972054dcbc87525dc3c07f8c0a0eee555718b.tar.xz ceph-6e7972054dcbc87525dc3c07f8c0a0eee555718b.zip | |
rgw: api fixes and adjustments
radosgw compiles
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Diffstat (limited to 'src/rgw/rgw_reshard.cc')
| -rw-r--r-- | src/rgw/rgw_reshard.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc index 6bdb9047e58..e16278dcbbd 100644 --- a/src/rgw/rgw_reshard.cc +++ b/src/rgw/rgw_reshard.cc @@ -307,7 +307,7 @@ static int create_new_bucket_instance(RGWRados *store, new_bucket_info.new_bucket_instance_id.clear(); new_bucket_info.reshard_status = 0; - int ret = store->init_bucket_index(new_bucket_info, new_bucket_info.num_shards); + int ret = store->svc.bi->init_index(new_bucket_info); if (ret < 0) { cerr << "ERROR: failed to init new bucket indexes: " << cpp_strerror(-ret) << std::endl; return ret; @@ -702,7 +702,7 @@ int RGWBucketReshard::execute(int num_shards, int max_op_entries, // best effort and don't report out an error; the lock isn't needed // at this point since all we're using a best effor to to remove old // shard objects - ret = store->clean_bucket_index(bucket_info, bucket_info.num_shards); + ret = store->svc.bi->clean_index(bucket_info); if (ret < 0) { lderr(store->ctx()) << "Error: " << __func__ << " failed to clean up old shards; " << @@ -732,8 +732,7 @@ error_out: // since the real problem is the issue that led to this error code // path, we won't touch ret and instead use another variable to // temporarily error codes - int ret2 = store->clean_bucket_index(new_bucket_info, - new_bucket_info.num_shards); + int ret2 = store->svc.bi->clean_index(new_bucket_info); if (ret2 < 0) { lderr(store->ctx()) << "Error: " << __func__ << " failed to clean up shards from failed incomplete resharding; " << |