RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 17:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gh/infernalis'

Browse Source
This commit is contained in:
Sage Weil 2015-09-20 13:54:19 -04:00
commit 5e8299f012
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mon/PGMap.cc
View File

@ -374,7 +374,7 @@ void PGMap::calc_stats()
redo_full_sets();
calc_min_last_epoch_clean();
min_last_epoch_clean = calc_min_last_epoch_clean();
}
void PGMap::update_pg(pg_t pgid, bufferlist& bl)

33
src/test/mon/PGMap.cc
View File

@ -81,7 +81,40 @@ TEST(pgmap, min_last_epoch_clean)
}
TEST(pgmap, calc_stats)
{
bufferlist bl;
{
PGMap pg_map;
PGMap::Incremental inc;
osd_stat_t os;
pg_stat_t ps;
ps.last_epoch_clean = 999;
inc.pg_stat_updates[pg_t(9,9)] = ps;
inc.version = 1;
inc.update_stat(0, 123, os);
pg_map.apply_incremental(g_ceph_context, inc);
ASSERT_EQ(123u, pg_map.get_min_last_epoch_clean());
pg_map.encode(bl);
}
{
PGMap pg_map;
PGMap::Incremental inc;
osd_stat_t os;
pg_stat_t ps;
ps.last_epoch_clean = 999;
inc.pg_stat_updates[pg_t(9,9)] = ps;
inc.version = 1;
inc.update_stat(0, 321, os);
pg_map.apply_incremental(g_ceph_context, inc);
ASSERT_EQ(321u, pg_map.get_min_last_epoch_clean());
bufferlist::iterator p = bl.begin();
::decode(pg_map, p);
ASSERT_EQ(123u, pg_map.get_min_last_epoch_clean());
}
}
int main(int argc, char **argv) {
vector<const char*> args;