RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd/OSDMap: rename pg_to_osds -> pg_to_raw_osds

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-06-06 12:16:08 -04:00
parent a651709d94
commit c385ebe76d
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/osd/OSDMap.cc
View File

@ -1516,9 +1516,10 @@ void OSDMap::_remove_nonexistent_osds(const pg_pool_t& pool,
}
}
int OSDMap::_pg_to_osds(const pg_pool_t& pool, pg_t pg,
vector<int> *osds, int *primary,
ps_t *ppps) const
int OSDMap::_pg_to_raw_osds(
const pg_pool_t& pool, pg_t pg,
vector<int> *osds, int *primary,
ps_t *ppps) const
{
// map to osds[]
ps_t pps = pool.raw_pg_to_pps(pg); // placement ps
@ -1659,14 +1660,14 @@ void OSDMap::_get_temp_osds(const pg_pool_t& pool, pg_t pg,
}
}
int OSDMap::pg_to_osds(pg_t pg, vector<int> *raw, int *primary) const
int OSDMap::pg_to_raw_osds(pg_t pg, vector<int> *raw, int *primary) const
{
*primary = -1;
raw->clear();
const pg_pool_t *pool = get_pg_pool(pg.pool());
if (!pool)
return 0;
int r = _pg_to_osds(*pool, pg, raw, primary, NULL);
int r = _pg_to_raw_osds(*pool, pg, raw, primary, NULL);
return r;
}
@ -1682,7 +1683,7 @@ void OSDMap::pg_to_raw_up(pg_t pg, vector<int> *up, int *primary) const
}
vector<int> raw;
ps_t pps;
_pg_to_osds(*pool, pg, &raw, primary, &pps);
_pg_to_raw_osds(*pool, pg, &raw, primary, &pps);
_raw_to_up_osds(*pool, raw, up, primary);
_apply_primary_affinity(pps, *pool, up, primary);
}
@ -1708,7 +1709,7 @@ void OSDMap::_pg_to_up_acting_osds(const pg_t& pg, vector<int> *up, int *up_prim
int _up_primary;
int _acting_primary;
ps_t pps;
_pg_to_osds(*pool, pg, &raw, &_up_primary, &pps);
_pg_to_raw_osds(*pool, pg, &raw, &_up_primary, &pps);
_raw_to_up_osds(*pool, raw, &_up, &_up_primary);
_apply_primary_affinity(pps, *pool, &_up, &_up_primary);
_get_temp_osds(*pool, pg, &_acting, &_acting_primary);

9
src/osd/OSDMap.h
View File

@ -612,9 +612,10 @@ public:
private:
/// pg -> (raw osd list)
int _pg_to_osds(const pg_pool_t& pool, pg_t pg,
vector<int> *osds, int *primary,
ps_t *ppps) const;
int _pg_to_raw_osds(
const pg_pool_t& pool, pg_t pg,
vector<int> *osds, int *primary,
ps_t *ppps) const;
void _remove_nonexistent_osds(const pg_pool_t& pool, vector<int>& osds) const;
void _apply_primary_affinity(ps_t seed, const pg_pool_t& pool,
@ -646,7 +647,7 @@ public:
* by anybody for data mapping purposes.
* raw and primary must be non-NULL
*/
int pg_to_osds(pg_t pg, vector<int> *raw, int *primary) const;
int pg_to_raw_osds(pg_t pg, vector<int> *raw, int *primary) const;
/// map a pg to its acting set. @return acting set size
int pg_to_acting_osds(const pg_t& pg, vector<int> *acting,
int *acting_primary) const {

6
src/tools/osdmaptool.cc
View File

@ -316,11 +316,11 @@ int main(int argc, const char **argv)
cout << " parsed '" << test_map_pg << "' -> " << pgid << std::endl;
vector<int> raw, up, acting;
int calced_primary, up_primary, acting_primary;
osdmap.pg_to_osds(pgid, &raw, &calced_primary);
int raw_primary, up_primary, acting_primary;
osdmap.pg_to_raw_osds(pgid, &raw, &raw_primary);
osdmap.pg_to_up_acting_osds(pgid, &up, &up_primary,
&acting, &acting_primary);
cout << pgid << " raw (" << raw << ", p" << calced_primary
cout << pgid << " raw (" << raw << ", p" << raw_primary
<< ") up (" << up << ", p" << up_primary
<< ") acting (" << acting << ", p" << acting_primary << ")"
<< std::endl;