Skip to content
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

mimic: rgw/multisite: Don't allow certain radosgw-admin commands to run on non-master zone #30133

Merged
merged 2 commits into from Oct 15, 2019

Conversation

@smithfarm
Copy link
Contributor

smithfarm commented Sep 4, 2019

but with an option to override, allowing changes only on the local zone.

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

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit 79d884e)
@smithfarm smithfarm added this to the mimic milestone Sep 4, 2019
@smithfarm smithfarm added the rgw label Sep 4, 2019
@smithfarm smithfarm requested a review from cbodley Sep 4, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Sep 8, 2019

test this please

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Sep 8, 2019

/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_admin.cc: In function 'int bucket_source_sync_status(RGWRados*, const RGWZone&, const RGWZone&, RGWRESTConn*, const RGWBucketInfo&, int, std::ostream&)':
/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_admin.cc:2383:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   for (size_t shard_id = 0; shard_id < total_shards; shard_id++) {
                             ~~~~~~~~~^~~~~~~~~~~~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_admin.cc: In function 'int main(int, const char**)':
/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_admin.cc:4821:34: error: 'class RGWRados' has no member named 'svc'
   bool non_master_cmd = (!store->svc.zone->is_meta_master() && !yes_i_really_mean_it);
                                  ^~~
src/rgw/CMakeFiles/radosgw-admin.dir/build.make:62: recipe for target 'src/rgw/CMakeFiles/radosgw-admin.dir/rgw_admin.cc.o' failed
make[3]: *** [src/rgw/CMakeFiles/radosgw-admin.dir/rgw_admin.cc.o] Error 1
Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit 14c3b4b)

Conflicts:
        src/rgw/rgw_admin.cc
- cherry-pick was clean, but there was a build failure "error: 'class RGWRados'
has no member named 'svc'", which was fixed by making the following change:

-  bool non_master_cmd = (!store->svc.zone->is_meta_master() && !yes_i_really_mean_it);
+  bool non_master_cmd = (!store->is_meta_master() && !yes_i_really_mean_it);
@smithfarm smithfarm force-pushed the smithfarm:wip-40850-mimic branch from cfb0beb to addec6f Sep 8, 2019
@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 10, 2019

@yuriw yuriw merged commit c4e086b into ceph:mimic Oct 15, 2019
4 checks passed
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-40850-mimic branch Oct 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.