wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug fix in shutdown. Normalized pager test filenames.

This commit is contained in:
Stephen Atherton 2018-07-04 21:12:09 -07:00
parent dfc8c5154c
commit 5936113cf4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbserver/IndirectShadowPager.actor.cpp
View File

@ -911,7 +911,7 @@ const PhysicalPageID PagerFile::INVALID_PAGE = std::numeric_limits<PhysicalPageI
extern Future<Void> simplePagerTest(IPager* const& pager); extern Future<Void> simplePagerTest(IPager* const& pager);
TEST_CASE("fdbserver/indirectshadowpager/simple") { TEST_CASE("fdbserver/indirectshadowpager/simple") {
state IPager *pager = new IndirectShadowPager("data/test"); state IPager *pager = new IndirectShadowPager("unittest_pageFile");
Void _ = wait(simplePagerTest(pager)); Void _ = wait(simplePagerTest(pager));

8
fdbserver/VersionedBTree.actor.cpp
View File

@ -1499,7 +1499,7 @@ public:
Void _ = wait(closedFuture); Void _ = wait(closedFuture);
self->m_closed.send(Void()); self->m_closed.send(Void());
if(self->m_error.canBeSet()) { if(self->m_error.canBeSet()) {
self->m_error.sendError(operation_cancelled()); self->m_error.send(Never());
} }
TraceEvent(SevInfo, "RedwoodShutdownComplete").detail("FilePrefix", self->m_filePrefix).detail("Dispose", dispose); TraceEvent(SevInfo, "RedwoodShutdownComplete").detail("FilePrefix", self->m_filePrefix).detail("Dispose", dispose);
delete self; delete self;
@ -1781,7 +1781,7 @@ ACTOR Future<int> verifyRandomRange(VersionedBTree *btree, Version v, std::map<s
TEST_CASE("/redwood/correctness") { TEST_CASE("/redwood/correctness") {
state bool useDisk = true; state bool useDisk = true;
state std::string pagerFile = "testPager"; state std::string pagerFile = "unittest_pageFile";
state IPager *pager; state IPager *pager;
if(useDisk) if(useDisk)
pager = new IndirectShadowPager(pagerFile); pager = new IndirectShadowPager(pagerFile);
@ -1936,8 +1936,8 @@ TEST_CASE("/redwood/correctness") {
} }
TEST_CASE("/redwood/performance/set") { TEST_CASE("/redwood/performance/set") {
state IPager *pager = new IndirectShadowPager("pagerfile"); state IPager *pager = new IndirectShadowPager("unittest_pageFile");
state VersionedBTree *btree = new VersionedBTree(pager, "pagerfile"); state VersionedBTree *btree = new VersionedBTree(pager, "unittest_pageFile");
Void _ = wait(btree->init()); Void _ = wait(btree->init());
state int nodeCount = 100000; state int nodeCount = 100000;