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

hammer: osd: ceph osd pool stats broken in hammer #7180

Merged
merged 1 commit into from Jan 14, 2016
Merged
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/mon/PGMap.cc
Expand Up @@ -983,7 +983,7 @@ void PGMap::print_osd_blocked_by_stats(std::ostream *ss) const
void PGMap::recovery_summary(Formatter *f, list<string> *psl,
const pool_stat_t& delta_sum) const
{
if (delta_sum.stats.sum.num_objects_degraded) {
if (delta_sum.stats.sum.num_objects_degraded && delta_sum.stats.sum.num_object_copies > 0) {
double pc = (double)delta_sum.stats.sum.num_objects_degraded /
(double)delta_sum.stats.sum.num_object_copies * (double)100.0;
char b[20];
Expand All @@ -999,7 +999,7 @@ void PGMap::recovery_summary(Formatter *f, list<string> *psl,
psl->push_back(ss.str());
}
}
if (delta_sum.stats.sum.num_objects_misplaced) {
if (delta_sum.stats.sum.num_objects_misplaced && delta_sum.stats.sum.num_object_copies > 0) {
double pc = (double)delta_sum.stats.sum.num_objects_misplaced /
(double)delta_sum.stats.sum.num_object_copies * (double)100.0;
char b[20];
Expand All @@ -1015,7 +1015,7 @@ void PGMap::recovery_summary(Formatter *f, list<string> *psl,
psl->push_back(ss.str());
}
}
if (delta_sum.stats.sum.num_objects_unfound) {
if (delta_sum.stats.sum.num_objects_unfound && delta_sum.stats.sum.num_objects) {
double pc = (double)delta_sum.stats.sum.num_objects_unfound /
(double)delta_sum.stats.sum.num_objects * (double)100.0;
char b[20];
Expand Down