RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 01:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3549 from Ved-vampir/master

Browse Source 
Ceph: Fix

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-02-02 02:55:39 -08:00
commit de3b5c4888
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mon/PGMap.cc
View File

@ -750,9 +750,9 @@ void PGMap::dump_pg_stats_plain(ostream& ss,
<< "\t" << st.last_change
<< "\t" << st.version
<< "\t" << st.reported_epoch << ":" << st.reported_seq
<< "\t" << st.up
<< "\t" << pg_vector_string(st.up)
<< "\t" << st.up_primary
<< "\t" << st.acting
<< "\t" << pg_vector_string(st.acting)
<< "\t" << st.acting_primary
<< "\t" << st.last_scrub << "\t" << st.last_scrub_stamp
<< "\t" << st.last_deep_scrub << "\t" << st.last_deep_scrub_stamp

16
src/osd/osd_types.cc
View File

@ -694,6 +694,22 @@ void coll_t::generate_test_instances(list<coll_t*>& o)
// ---
std::string pg_vector_string(const vector<int32_t> &a)
{
ostringstream oss;
oss << "[";
for (vector<int32_t>::const_iterator i = a.begin(); i != a.end(); ++i) {
if (i != a.begin())
oss << ",";
if (*i != CRUSH_ITEM_NONE)
oss << *i;
else
oss << "NONE";
}
oss << "]";
return oss.str();
}
std::string pg_state_string(int state)
{
ostringstream oss;

2
src/osd/osd_types.h
View File

@ -770,7 +770,7 @@ inline ostream& operator<<(ostream& out, const osd_stat_t& s) {
#define PG_STATE_ACTIVATING (1<<24) // pg is peered but not yet active
std::string pg_state_string(int state);
std::string pg_vector_string(const vector<int32_t> &a);
/*
* pool_snap_info_t