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

rgw: use get_data_extra_pool() when get extra pool #15219

Merged
merged 1 commit into from May 26, 2017
Merged

rgw: use get_data_extra_pool() when get extra pool #15219

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/rgw/rgw_rados.cc
View file
Open in desktop
Expand Up @@ -130,7 +130,7 @@ static bool rgw_get_obj_data_pool(const RGWZoneGroup& zonegroup, const RGWZonePa
if (!obj.in_extra_data) {
*pool = placement.data_pool;
} else {
*pool = placement.data_extra_pool;
*pool = placement.get_data_extra_pool();
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/rgw/rgw_rados.h
View file
Open in desktop
Expand Up @@ -1121,7 +1121,7 @@ struct RGWZonePlacementInfo {
}
DECODE_FINISH(bl);
}
const rgw_pool& get_data_extra_pool() {
const rgw_pool& get_data_extra_pool() const {
if (data_extra_pool.empty()) {
return data_pool;
}
Expand Down Expand Up @@ -1293,7 +1293,7 @@ struct RGWZoneParams : RGWSystemMetaObj {
if (!obj.in_extra_data) {
*pool = iter->second.data_pool;
} else {
*pool = iter->second.data_extra_pool;
*pool = iter->second.get_data_extra_pool();
}
return true;
}
Expand Down