Skip to content

Commit

Permalink
rgw: s/wait_for_safe/wait_for_complete/
Browse files Browse the repository at this point in the history
Signed-off-by: Kefu Chai <kchai@redhat.com>
  • Loading branch information
tchaikov committed Nov 1, 2019
1 parent 20bb201 commit 3f5afc9
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/rgw/rgw_bucket.cc
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ static int rgw_remove_bucket(RGWRadosStore *store, rgw_bucket& bucket, bool dele
static int aio_wait(librados::AioCompletion *handle)
{
librados::AioCompletion *c = (librados::AioCompletion *)handle;
c->wait_for_safe();
c->wait_for_complete();
int ret = c->get_return_value();
c->release();
return ret;
Expand Down
2 changes: 1 addition & 1 deletion src/rgw/rgw_gc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ class RGWGCIOManager {
int handle_next_completion() {
ceph_assert(!ios.empty());
IO& io = ios.front();
io.c->wait_for_safe();
io.c->wait_for_complete();
int ret = io.c->get_return_value();
io.c->release();

Expand Down
2 changes: 1 addition & 1 deletion src/rgw/rgw_rados.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5272,7 +5272,7 @@ int RGWRados::Object::Stat::wait()
return state.ret;
}

state.completion->wait_for_safe();
state.completion->wait_for_complete();
state.ret = state.completion->get_return_value();
state.completion->release();

Expand Down
2 changes: 1 addition & 1 deletion src/rgw/rgw_reshard.cc
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class BucketReshardShard {
librados::AioCompletion *c = aio_completions.front();
aio_completions.pop_front();

c->wait_for_safe();
c->wait_for_complete();

int ret = c->get_return_value();
c->release();
Expand Down
2 changes: 1 addition & 1 deletion src/rgw/services/svc_notify.cc
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class RGWWatcher : public librados::WatchCtx2 {
if (!register_completion) {
return -EINVAL;
}
register_completion->wait_for_safe();
register_completion->wait_for_complete();
int r = register_completion->get_return_value();
register_completion->release();
register_completion = nullptr;
Expand Down

0 comments on commit 3f5afc9

Please sign in to comment.