Project

General

Profile

Fix #10519 ยป crush_item_none_name.patch

Alyona Kiseleva, 01/29/2015 10:55 AM

View differences:

src/erasure-code/jerasure/gf-complete
Subproject commit d384952c68a64d93ac7af6341d5519ea5d2958b9
Subproject commit 39768c55bb00917691364f6f9f7bf688235aedf8
src/erasure-code/jerasure/jerasure
Subproject commit 02731df4c1eae1819c4453c9d3ab6d408cadd085
Subproject commit 8fe20c6608385d6a1f38db89aec5cba85ccf04ac
src/mon/PGMap.cc
<< "\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
src/osd/osd_types.cc
// ---
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 << "CRUSH_ITEM_NONE";
}
oss << "]";
string ret(oss.str());
return ret;
}
std::string pg_state_string(int state)
{
ostringstream oss;
src/osd/osd_types.h
#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);
/*
    (1-1/1)