diff options
| author | Sage Weil <sage@inktank.com> | 2012-05-07 15:37:23 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-05-07 15:39:37 -0700 |
| commit | 8b393269008411a612ca549b733b4296e819f2fb (patch) | |
| tree | 0c6977cd34d1d818234765c48f0b6ce31ca39707 /net/ceph | |
| parent | 6eb43f4b5a2a74599b4ff17a97c03a342327ca65 (diff) | |
| download | linux-stable-8b393269008411a612ca549b733b4296e819f2fb.tar.gz linux-stable-8b393269008411a612ca549b733b4296e819f2fb.tar.bz2 linux-stable-8b393269008411a612ca549b733b4296e819f2fb.zip | |
crush: warn on do_rule failure
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>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/osdmap.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index dac448ba68e4..2592f3cca987 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -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_pool_info *pool; int ruleno; - unsigned poolid, ps, pps, t; + unsigned poolid, ps, pps, t, r; poolid = le32_to_cpu(pgid.pool); 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), pool->pgp_num_mask); pps += poolid; - *num = crush_do_rule(osdmap->crush, ruleno, pps, osds, - min_t(int, pool->v.size, *num), - osdmap->osd_weight); + r = crush_do_rule(osdmap->crush, ruleno, pps, osds, + min_t(int, pool->v.size, *num), + 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; } |