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

osdmaptool: add --test-map-pgs mode

Browse Source 
This command will map all pgs from all pools (or just one pool) to osds
and summarize the placement and calculate the actual standard deviation and
the expected value.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2014-02-03 16:19:07 -08:00
parent e4ff4720d5
commit 7f1b12f2ef
2 changed files with 126 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osd/OSDMap.h
View File

@ -712,6 +712,11 @@ public:
bool crush_ruleset_in_use(int ruleset) const;
void clear_temp() {
pg_temp->clear();
primary_temp->clear();
}
private:
void print_osd_line(int cur, ostream *out, Formatter *f) const;
public:

122
src/tools/osdmaptool.cc
View File

@ -34,6 +34,9 @@ void usage()
cout << " usage: [--print] [--createsimple <numosd> [--clobber] [--pg_bits <bitsperosd>]] <mapfilename>" << std::endl;
cout << " --export-crush <file> write osdmap's crush map to <file>" << std::endl;
cout << " --import-crush <file> replace osdmap's crush map with <file>" << std::endl;
cout << " --test-map-pgs map all pgs" << std::endl;
cout << " --mark-up-in mark osds up and in (but do not persist)" << std::endl;
cout << " --clear-temp clear pg_temp and primary_temp" << std::endl;
cout << " --test-map-pg <pgid> map a pgid to osds" << std::endl;
cout << " --test-map-object <objectname> [--pool <poolid>] map an object to osds"
<< std::endl;
@ -68,6 +71,10 @@ int main(int argc, const char **argv)
int range_first = -1;
int range_last = -1;
int pool = 0;
bool mark_up_in = false;
bool clear_temp = false;
bool test_map_pgs = false;
int test_pool = -1;
std::string val;
std::ostringstream err;
@ -90,6 +97,13 @@ int main(int argc, const char **argv)
createsimple = true;
} else if (ceph_argparse_flag(args, i, "--create-from-conf", (char*)NULL)) {
create_from_conf = true;
} else if (ceph_argparse_flag(args, i, "--mark-up-in", (char*)NULL)) {
mark_up_in = true;
} else if (ceph_argparse_flag(args, i, "--clear-temp", (char*)NULL)) {
clear_temp = true;
} else if (ceph_argparse_flag(args, i, "--test-map-pgs", (char*)NULL)) {
test_map_pgs = true;
} else if (ceph_argparse_withint(args, i, &test_pool, &err, "--pool", (char*)NULL)) {
} else if (ceph_argparse_flag(args, i, "--clobber", (char*)NULL)) {
clobber = true;
} else if (ceph_argparse_withint(args, i, &pg_bits, &err, "--pg_bits", (char*)NULL)) {
@ -197,6 +211,20 @@ int main(int argc, const char **argv)
modified = true;
}
if (mark_up_in) {
cout << "marking all OSDs up and in" << std::endl;
int n = osdmap.get_max_osd();
for (int i=0; i<n; i++) {
osdmap.set_state(i, osdmap.get_state(i) | CEPH_OSD_UP);
osdmap.set_weight(i, CEPH_OSD_IN);
osdmap.crush->adjust_item_weightf(g_ceph_context, i, 1.0);
}
}
if (clear_temp) {
cout << "clearing pg/primary temp" << std::endl;
osdmap.clear_temp();
}
if (!import_crush.empty()) {
bufferlist cbl;
std::string error;
@ -275,6 +303,97 @@ int main(int argc, const char **argv)
<< ") acting (" << acting << ", p" << acting_primary << ")"
<< std::endl;
}
if (test_map_pgs) {
int n = osdmap.get_max_osd();
vector<int> count(n, 0);
vector<int> first_count(n, 0);
vector<int> primary_count(n, 0);
vector<int> size(30, 0);
const map<int64_t,pg_pool_t>& pools = osdmap.get_pools();
for (map<int64_t,pg_pool_t>::const_iterator p = pools.begin();
p != pools.end(); ++p) {
if (test_pool >= 0 && p->first != test_pool)
continue;
cout << "pool " << p->first
<< " pg_num " << p->second.get_pg_num() << std::endl;
for (unsigned i = 0; i < p->second.get_pg_num(); ++i) {
pg_t pgid = pg_t(i, p->first);
vector<int> osds;
int primary;
osdmap.pg_to_acting_osds(pgid, &osds, &primary);
size[osds.size()]++;
for (unsigned i=0; i<osds.size(); i++) {
//cout << " rep " << i << " on " << osds[i] << std::endl;
count[osds[i]]++;
}
if (osds.size())
first_count[osds[0]]++;
if (primary >= 0)
primary_count[primary]++;
}
}
uint64_t total = 0;
int in = 0;
int min_osd = -1;
int max_osd = -1;
cout << "#osd\tcount\tfirst\tprimary\tc wt\twt\n";
for (int i=0; i<n; i++) {
if (!osdmap.is_in(i))
continue;
if (osdmap.crush->get_item_weight(i) <= 0)
continue;
in++;
cout << "osd." << i
<< "\t" << count[i]
<< "\t" << first_count[i]
<< "\t" << primary_count[i]
<< "\t" << osdmap.crush->get_item_weightf(i)
<< "\t" << osdmap.get_weightf(i)
<< std::endl;
total += count[i];
if (count[i] &&
(min_osd < 0 ||
count[i] < count[min_osd]))
min_osd = i;
if (count[i] &&
(max_osd < 0 ||
count[i] > count[max_osd]))
max_osd = i;
}
uint64_t avg = total / in;
double dev = 0;
for (int i=0; i<n; i++) {
if (!osdmap.is_in(i))
continue;
if (osdmap.crush->get_item_weight(i) <= 0)
continue;
dev += (avg - count[i]) * (avg - count[i]);
}
dev /= in;
dev = sqrt(dev);
//double edev = sqrt(pgavg) * (double)avg / pgavg;
double edev = sqrt((double)total / (double)in * (1.0 - (1.0 / (double)in)));
cout << " in " << in << std::endl;
cout << " avg " << avg
<< " stddev " << dev
<< " (" << (dev/avg) << "x)"
<< " (expected " << edev << " " << (edev/avg) << "x))"
<< std::endl;
if (min_osd >= 0)
cout << " min osd." << min_osd << " " << count[min_osd] << std::endl;
if (max_osd >= 0)
cout << " max osd." << max_osd << " " << count[max_osd] << std::endl;
for (int i=0; i<4; i++) {
cout << "size " << i << "\t" << size[i] << std::endl;
}
}
if (test_crush) {
int pass = 0;
while (1) {
@ -308,7 +427,8 @@ int main(int argc, const char **argv)
if (!print && !print_json && !tree && !modified &&
export_crush.empty() && import_crush.empty() &&
test_map_pg.empty() && test_map_object.empty()) {
test_map_pg.empty() && test_map_object.empty() &&
!test_map_pgs) {
cerr << me << ": no action specified?" << std::endl;
usage();
}