RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ceph/ceph

Browse Source
This commit is contained in:
Sage Weil 2016-02-10 13:58:50 -05:00
commit cb82fc69bd
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/rgw/rgw_bucket.cc
View File

@ -499,6 +499,11 @@ int rgw_remove_bucket(RGWRados *store, rgw_bucket& bucket, bool delete_children)
}
}
ret = rgw_bucket_sync_user_stats(store, bucket.tenant, bucket.name);
if ( ret < 0) {
dout(1) << "WARNING: failed sync user stats before bucket delete. ret=" << ret << dendl;
}
RGWObjVersionTracker objv_tracker;
ret = store->delete_bucket(bucket, objv_tracker);

5
src/rgw/rgw_op.cc
View File

@ -1878,6 +1878,11 @@ void RGWDeleteBucket::execute()
}
}
op_ret = rgw_bucket_sync_user_stats(store, s->user.user_id, s->bucket);
if ( op_ret < 0) {
ldout(s->cct, 1) << "WARNING: failed to sync user stats before bucket delete: op_ret= " << op_ret << dendl;
}
op_ret = store->delete_bucket(s->bucket, ot);
if (op_ret == 0) {
op_ret = rgw_unlink_bucket(store, s->user.user_id, s->bucket.tenant,

6
src/rgw/rgw_orphan.cc
View File

@ -578,7 +578,11 @@ int RGWOrphanSearch::build_linked_oids_index()
return ret;
}
save_state();
ret = save_state();
if (ret < 0) {
cerr << __func__ << ": ERROR: failed to write state ret=" << ret << std::endl;
return ret;
}
return 0;
}