New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jewel: rgw: Delete non-empty bucket in slave zonegroup #15477

Merged
merged 1 commit into from Aug 29, 2017

Conversation

Projects
None yet
3 participants
@smithfarm
Contributor

smithfarm commented Jun 5, 2017

@smithfarm smithfarm self-assigned this Jun 5, 2017

@smithfarm smithfarm added this to the jewel milestone Jun 5, 2017

@smithfarm smithfarm added bug fix core rgw and removed core labels Jun 5, 2017

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Jun 19, 2017

Contributor
CXX      rgw/librgw_la-rgw_rest_conn.lo
rgw/rgw_rados.cc:7393:3: error: expected initializer before ‘std’
   std::map<string, RGWObjEnt> ent_map;
   ^
rgw/rgw_rados.cc:7398:3: error: expected unqualified-id before ‘do’
   do {
   ^
rgw/rgw_rados.cc:97:23: warning: ‘main_category’ defined but not used [-Wunused-variable]
 static RGWObjCategory main_category = RGW_OBJ_CATEGORY_MAIN;
                       ^
Makefile:24756: recipe for target 'rgw/librgw_la-rgw_rados.lo' failed
Contributor

smithfarm commented Jun 19, 2017

CXX      rgw/librgw_la-rgw_rest_conn.lo
rgw/rgw_rados.cc:7393:3: error: expected initializer before ‘std’
   std::map<string, RGWObjEnt> ent_map;
   ^
rgw/rgw_rados.cc:7398:3: error: expected unqualified-id before ‘do’
   do {
   ^
rgw/rgw_rados.cc:97:23: warning: ‘main_category’ defined but not used [-Wunused-variable]
 static RGWObjCategory main_category = RGW_OBJ_CATEGORY_MAIN;
                       ^
Makefile:24756: recipe for target 'rgw/librgw_la-rgw_rados.lo' failed
rgw: delete non-empty buckets in slave zonegroup returns error but the
buckets have actually been deleted.

Fixes: http://tracker.ceph.com/issues/19313

Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit 4714b17)

Conflicts:
        src/rgw/rgw_op.cc - first argument to delete_bucket() and
            check_bucket_empty() is "s->bucket" in jewel (master:
            "s->bucket_info")
        src/rgw/rgw_rados.cc - RGWRados::delete_bucket() takes bucket instead
            of bucket_info; adapt RGWRados::check_bucket_empty() to take bucket
            instead of bucket_info as well
	src/rgw/rgw_rados.h - ditto

@smithfarm smithfarm requested a review from cbodley Aug 29, 2017

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Aug 29, 2017

Contributor

@cbodley This passed an rgw run at http://tracker.ceph.com/issues/20613#note-29

It also passed a rados run at http://tracker.ceph.com/issues/20613#note-25 - this run initially had some odd rgw-related errors, but they were not reproducible.

Please review.

Contributor

smithfarm commented Aug 29, 2017

@cbodley This passed an rgw run at http://tracker.ceph.com/issues/20613#note-29

It also passed a rados run at http://tracker.ceph.com/issues/20613#note-25 - this run initially had some odd rgw-related errors, but they were not reproducible.

Please review.

@smithfarm smithfarm merged commit 4fcd7ee into ceph:jewel Aug 29, 2017

4 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details

@smithfarm smithfarm deleted the smithfarm:wip-19767-jewel branch Aug 29, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment