RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 00:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #809 from ceph/wip-pgmap

Browse Source 
Reviewed-by: Greg Farnum <greg@inktank.com>
This commit is contained in:
Gregory Farnum 2013-11-03 09:25:28 -08:00
commit 5687a18d91
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mon/PGMap.cc
View File

@ -787,7 +787,7 @@ void PGMap::print_osd_perf_stats(std::ostream *ss) const
}
void PGMap::recovery_summary(Formatter *f, ostream *out,
pool_stat_t delta_sum) const
const pool_stat_t& delta_sum) const
{
bool first = true;
if (delta_sum.stats.sum.num_objects_degraded) {
@ -825,7 +825,7 @@ void PGMap::recovery_summary(Formatter *f, ostream *out,
}
void PGMap::recovery_rate_summary(Formatter *f, ostream *out,
pool_stat_t delta_sum,
const pool_stat_t& delta_sum,
utime_t delta_stamp) const
{
// make non-negative; we can get negative values if osds send
@ -886,7 +886,7 @@ void PGMap::pool_recovery_summary(Formatter *f, ostream *out,
}
void PGMap::client_io_rate_summary(Formatter *f, ostream *out,
pool_stat_t delta_sum,
const pool_stat_t& delta_sum,
utime_t delta_stamp) const
{
pool_stat_t pos_delta = delta_sum;

6
src/mon/PGMap.h
View File

@ -244,12 +244,12 @@ public:
void print_osd_perf_stats(std::ostream *ss) const;
void recovery_summary(Formatter *f, ostream *out,
pool_stat_t delta_sum) const;
const pool_stat_t& delta_sum) const;
void overall_recovery_summary(Formatter *f, ostream *out) const;
void pool_recovery_summary(Formatter *f, ostream *out,
uint64_t poolid) const;
void recovery_rate_summary(Formatter *f, ostream *out,
pool_stat_t delta_sum,
const pool_stat_t& delta_sum,
utime_t delta_stamp) const;
void overall_recovery_rate_summary(Formatter *f, ostream *out) const;
void pool_recovery_rate_summary(Formatter *f, ostream *out,
@ -259,7 +259,7 @@ public:
* given @p delta_sum pool over a given @p delta_stamp period of time.
*/
void client_io_rate_summary(Formatter *f, ostream *out,
pool_stat_t delta_sum,
const pool_stat_t& delta_sum,
utime_t delta_stamp) const;
/**
* Obtain a formatted/plain output for the overall client I/O, which is