UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

libceph: redo ceph_calc_pg_primary() in terms of ceph_calc_pg_acting() 

Reimplement ceph_calc_pg_primary() in terms of ceph_calc_pg_acting()
and get rid of the now unused calc_pg_raw().

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Alex Elder <elder@linaro.org>
This commit is contained in:
Ilya Dryomov 2014-03-24 17:12:49 +02:00 committed by Sage Weil
parent 47ec1f3cc4
commit c4c1228525
1 changed files with 4 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
net/ceph/osdmap.c
View File

@ -1455,71 +1455,6 @@ static int do_crush(struct ceph_osdmap *map, int ruleno, int x,
return r; return r;
} }
/*
* Calculate raw osd vector for the given pgid. Return pointer to osd
* array, or NULL on failure.
*/
static int *calc_pg_raw(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
int *osds, int *num)
{
struct ceph_pg_mapping *pg;
struct ceph_pg_pool_info *pool;
int ruleno;
int r;
u32 pps;
pool = __lookup_pg_pool(&osdmap->pg_pools, pgid.pool);
if (!pool)
return NULL;
/* pg_temp? */
pgid.seed = ceph_stable_mod(pgid.seed, pool->pg_num,
pool->pg_num_mask);
pg = __lookup_pg_mapping(&osdmap->pg_temp, pgid);
if (pg) {
*num = pg->pg_temp.len;
return pg->pg_temp.osds;
}
/* crush */
ruleno = crush_find_rule(osdmap->crush, pool->crush_ruleset,
pool->type, pool->size);
if (ruleno < 0) {
pr_err("no crush rule pool %lld ruleset %d type %d size %d\n",
pgid.pool, pool->crush_ruleset, pool->type,
pool->size);
return NULL;
}
if (pool->flags & CEPH_POOL_FLAG_HASHPSPOOL) {
/* hash pool id and seed sothat pool PGs do not overlap */
pps = crush_hash32_2(CRUSH_HASH_RJENKINS1,
ceph_stable_mod(pgid.seed, pool->pgp_num,
pool->pgp_num_mask),
pgid.pool);
} else {
/*
* legacy ehavior: add ps and pool together. this is
* not a great approach because the PGs from each pool
* will overlap on top of each other: 0.5 == 1.4 ==
* 2.3 == ...
*/
pps = ceph_stable_mod(pgid.seed, pool->pgp_num,
pool->pgp_num_mask) +
(unsigned)pgid.pool;
}
r = do_crush(osdmap, ruleno, pps, osds, min_t(int, pool->size, *num),
osdmap->osd_weight, osdmap->max_osd);
if (r < 0) {
pr_err("error %d from crush rule: pool %lld ruleset %d type %d"
" size %d\n", r, pgid.pool, pool->crush_ruleset,
pool->type, pool->size);
return NULL;
}
*num = r;
return osds;
}
/* /*
* Calculate raw (crush) set for given pgid. * Calculate raw (crush) set for given pgid.
* *
@ -1776,17 +1711,11 @@ int ceph_calc_pg_acting(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
*/ */
int ceph_calc_pg_primary(struct ceph_osdmap *osdmap, struct ceph_pg pgid) int ceph_calc_pg_primary(struct ceph_osdmap *osdmap, struct ceph_pg pgid)
{ {
int rawosds[CEPH_PG_MAX_SIZE], *osds; int osds[CEPH_PG_MAX_SIZE];
int i, num = CEPH_PG_MAX_SIZE; int primary;
osds = calc_pg_raw(osdmap, pgid, rawosds, &num); ceph_calc_pg_acting(osdmap, pgid, osds, &primary);
if (!osds)
return -1;
/* primary is first up osd */ return primary;
for (i = 0; i < num; i++)
if (ceph_osd_is_up(osdmap, osds[i]))
return osds[i];
return -1;
} }
EXPORT_SYMBOL(ceph_calc_pg_primary); EXPORT_SYMBOL(ceph_calc_pg_primary);