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.

Sign up for GitHub

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

Jump to bottom

mimic: rgw: multisite: 'radosgw-admin bucket sync status' should call syncs_from(source.name) instead of id #29270

Merged
merged 1 commit into from
Aug 6, 2019
Merged

mimic: rgw: multisite: 'radosgw-admin bucket sync status' should call syncs_from(source.name) instead of id #29270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/rgw/rgw_admin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2363,7 +2363,7 @@ static int bucket_source_sync_status(RGWRados *store, const RGWZone& zone,
out << indented{width, "source zone"} << source.id << " (" << source.name << ")\n";

// syncing from this zone?
if (!zone.syncs_from(source.id)) {
if (!zone.syncs_from(source.name)) {
out << indented{width} << "not in sync_from\n";
return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions src/rgw/rgw_rados.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1415,8 +1415,8 @@ struct RGWZone {

bool is_read_only() { return read_only; }

bool syncs_from(const string& zone_id) const {
return (sync_from_all || sync_from.find(zone_id) != sync_from.end());
bool syncs_from(const string& zone_name) const {
return (sync_from_all || sync_from.find(zone_name) != sync_from.end());
}
};
WRITE_CLASS_ENCODER(RGWZone)
Expand Down