summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-10-04 22:06:04 -0700
committerSage Weil <sage@inktank.com>2013-10-04 22:06:04 -0700
commit92a60a05841397aa0c59a1097e133eaca27ca532 (patch)
treeb7d1d1bcc2dff03fd154b8e7799cbf35da0ae667
parent7efbebe20f7372965c81c150e0e3d2c42c18ac4e (diff)
downloadceph-92a60a05841397aa0c59a1097e133eaca27ca532.tar.gz
mon/PGMap: make generated test instances obey new invariant
As of 091809b8149c7595cbcca439c5b8b75a0c42efe1 we keep an osd_map epoch for any osd_stat update, and assert as much. Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/mon/PGMap.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 0b3a0a6506c..ea70bbd61c3 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -152,6 +152,7 @@ void PGMap::Incremental::generate_test_instances(list<PGMap::Incremental*>& o)
o.back()->version = 2;
o.back()->pg_stat_updates[pg_t(1,2,3)] = pg_stat_t();
o.back()->osd_stat_updates[5] = osd_stat_t();
+ o.back()->osd_epochs[5] = 12;
o.push_back(new Incremental);
o.back()->version = 3;
o.back()->osdmap_epoch = 1;
@@ -160,6 +161,7 @@ void PGMap::Incremental::generate_test_instances(list<PGMap::Incremental*>& o)
o.back()->nearfull_ratio = .3;
o.back()->pg_stat_updates[pg_t(4,5,6)] = pg_stat_t();
o.back()->osd_stat_updates[6] = osd_stat_t();
+ o.back()->osd_epochs[6] = 12;
o.back()->pg_remove.insert(pg_t(1,2,3));
o.back()->osd_stat_rm.insert(5);
}