leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crush: warn on do_rule failure

Browse Source 
If we get an error code from crush_do_rule(), print an error to the
console.

Reviewed-by: Alex Elder <elder@inktank.com>
Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-05-07 15:37:23 -07:00
parent 6eb43f4b5a
commit 8b39326900
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/ceph/osdmap.c
View File

@ -1027,7 +1027,7 @@ static int *calc_pg_raw(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
struct ceph_pg_mapping *pg; struct ceph_pg_mapping *pg;
struct ceph_pg_pool_info *pool; struct ceph_pg_pool_info *pool;
int ruleno; int ruleno;
unsigned poolid, ps, pps, t; unsigned poolid, ps, pps, t, r;
poolid = le32_to_cpu(pgid.pool); poolid = le32_to_cpu(pgid.pool);
ps = le16_to_cpu(pgid.ps); ps = le16_to_cpu(pgid.ps);
@ -1060,9 +1060,16 @@ static int *calc_pg_raw(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
le32_to_cpu(pool->v.pgp_num), le32_to_cpu(pool->v.pgp_num),
pool->pgp_num_mask); pool->pgp_num_mask);
pps += poolid; pps += poolid;
*num = crush_do_rule(osdmap->crush, ruleno, pps, osds, r = crush_do_rule(osdmap->crush, ruleno, pps, osds,
min_t(int, pool->v.size, *num), min_t(int, pool->v.size, *num),
osdmap->osd_weight); osdmap->osd_weight);
if (r < 0) {
pr_err("error %d from crush rule: pool %d ruleset %d type %d"
" size %d\n", r, poolid, pool->v.crush_ruleset,
pool->v.type, pool->v.size);
return NULL;
}
*num = r;
return osds; return osds;
} }