Merge pull request #9056 from stiopaa1/osd_pistate_localstruct

osd/OSD.cc: make pistate a local struct

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2016-06-17 18:49:50 +08:00 committed by GitHub
commit 733315663f

View File

@ -3361,16 +3361,15 @@ void OSD::load_pgs()
* follow the same logic, but do all pgs at the same time so that we
* can make a single pass across the osdmap history.
*/
struct pistate {
epoch_t start, end;
vector<int> old_acting, old_up;
epoch_t same_interval_since;
int primary;
int up_primary;
};
void OSD::build_past_intervals_parallel()
{
struct pistate {
epoch_t start, end;
vector<int> old_acting, old_up;
epoch_t same_interval_since;
int primary;
int up_primary;
};
map<PG*,pistate> pis;
// calculate junction of map range