diff options
author | Samuel Just <sam.just@inktank.com> | 2013-07-22 13:44:24 -0700 |
---|---|---|
committer | Samuel Just <sam.just@inktank.com> | 2013-07-22 15:05:52 -0700 |
commit | 046d5cb6db99e4cf38e870a5de487eadd856ebda (patch) | |
tree | ac367ac9a63f1b1a6d2bc4c6e6d2f3f1ffd1fb40 | |
parent | 1ecdb14937583d44273b8a2861379754f9c1c615 (diff) | |
download | ceph-046d5cb6db99e4cf38e870a5de487eadd856ebda.tar.gz |
src/test/osd/TestPGLog.cc: check that the object remains in log.objects
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
-rw-r--r-- | src/test/osd/TestPGLog.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/test/osd/TestPGLog.cc b/src/test/osd/TestPGLog.cc index d8ec8d03df2..e0863f726a0 100644 --- a/src/test/osd/TestPGLog.cc +++ b/src/test/osd/TestPGLog.cc @@ -82,6 +82,10 @@ TEST_F(PGLogTest, rewind_divergent_log) { hobject_t divergent_object; eversion_t divergent_version; eversion_t newhead; + + hobject_t divergent; + divergent.hash = 0x9; + { pg_log_entry_t e; @@ -90,16 +94,16 @@ TEST_F(PGLogTest, rewind_divergent_log) { log.tail = e.version; log.log.push_back(e); e.version = newhead = eversion_t(1, 4); - e.soid.hash = 0x9; + e.soid = divergent; e.op = pg_log_entry_t::MODIFY; log.log.push_back(e); - log.index(); e.version = divergent_version = eversion_t(1, 5); - e.soid.hash = 0x9; + e.soid = divergent; divergent_object = e.soid; e.op = pg_log_entry_t::DELETE; log.log.push_back(e); log.head = e.version; + log.index(); info.last_update = log.head; info.last_complete = log.head; @@ -118,6 +122,7 @@ TEST_F(PGLogTest, rewind_divergent_log) { rewind_divergent_log(t, newhead, info, remove_snap, dirty_info, dirty_big_info); + EXPECT_TRUE(log.objects.count(divergent)); EXPECT_TRUE(missing.is_missing(divergent_object)); EXPECT_EQ(1U, log.objects.count(divergent_object)); EXPECT_EQ(2U, log.log.size()); |