p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libceph: switch ceph_calc_pg_acting() to new helpers 

Switch ceph_calc_pg_acting() to new helpers: pg_to_raw_osds(),
raw_to_up_osds() and apply_temps().

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:48 +02:00 committed by Sage Weil
parent 45966c3467
commit ac972230e2
2 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/ceph/osdmap.h
View File

@ -212,7 +212,7 @@ extern int ceph_oloc_oid_to_pg(struct ceph_osdmap *osdmap,
extern int ceph_calc_pg_acting(struct ceph_osdmap *osdmap, extern int ceph_calc_pg_acting(struct ceph_osdmap *osdmap,
struct ceph_pg pgid, struct ceph_pg pgid,
int *acting); int *osds);
extern int ceph_calc_pg_primary(struct ceph_osdmap *osdmap, extern int ceph_calc_pg_primary(struct ceph_osdmap *osdmap,
struct ceph_pg pgid); struct ceph_pg pgid);

51
net/ceph/osdmap.c
View File

@ -1649,24 +1649,49 @@ static int apply_temps(struct ceph_osdmap *osdmap,
} }
/* /*
* Return acting set for given pgid. * Calculate acting set for given pgid.
*
* Return acting set length, or error.
*/ */
int ceph_calc_pg_acting(struct ceph_osdmap *osdmap, struct ceph_pg pgid, int ceph_calc_pg_acting(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
int *acting) int *osds)
{ {
int rawosds[CEPH_PG_MAX_SIZE], *osds; struct ceph_pg_pool_info *pool;
int i, o, num = CEPH_PG_MAX_SIZE; u32 pps;
int len;
int primary;
osds = calc_pg_raw(osdmap, pgid, rawosds, &num); pool = __lookup_pg_pool(&osdmap->pg_pools, pgid.pool);
if (!osds) if (!pool)
return -1; return 0;
/* primary is first up osd */ if (pool->flags & CEPH_POOL_FLAG_HASHPSPOOL) {
o = 0; /* hash pool id and seed so that pool PGs do not overlap */
for (i = 0; i < num; i++) pps = crush_hash32_2(CRUSH_HASH_RJENKINS1,
if (ceph_osd_is_up(osdmap, osds[i])) ceph_stable_mod(pgid.seed, pool->pgp_num,
acting[o++] = osds[i]; pool->pgp_num_mask),
return o; pgid.pool);
} else {
/*
* legacy behavior: 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;
}
len = pg_to_raw_osds(osdmap, pool, pgid, pps, osds);
if (len < 0)
return len;
len = raw_to_up_osds(osdmap, pool, osds, len, &primary);
len = apply_temps(osdmap, pool, pgid, osds, len, &primary);
return len;
} }
/* /*