ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SHAMapStore test timing consistency

Browse Source
This commit is contained in:
Edward Hennis
2016-03-11 14:04:21 -05:00
parent 30eff2b520
commit 8268162cac
4 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ripple/app/misc/SHAMapStore.h
View File

@@ -57,6 +57,8 @@ public:
/** Called by LedgerMaster every time a ledger validates. */
virtual void onLedgerClosed(std::shared_ptr<Ledger const> const& ledger) = 0;
virtual void rendezvous() const = 0;
virtual std::uint32_t clampFetchDepth (std::uint32_t fetch_depth) const = 0;
virtual std::unique_ptr <NodeStore::Database> makeDatabase (

20
src/ripple/app/misc/SHAMapStoreImp.cpp
View File

@@ -180,7 +180,7 @@ SHAMapStoreImp::SHAMapStoreImp (
, scheduler_ (scheduler)
, journal_ (journal)
, nodeStoreJournal_ (nodeStoreJournal)
, rotating_(false)
, working_(true)
, transactionMaster_ (transactionMaster)
, canDelete_ (std::numeric_limits <LedgerIndex>::max())
{
@@ -251,10 +251,24 @@ SHAMapStoreImp::onLedgerClosed(
{
std::lock_guard <std::mutex> lock (mutex_);
newLedger_ = ledger;
working_ = true;
}
cond_.notify_one();
}
void
SHAMapStoreImp::rendezvous() const
{
if (!working_)
return;
std::unique_lock <std::mutex> lock(mutex_);
rendezvous_.wait(lock, [&]
{
return !working_;
});
}
bool
SHAMapStoreImp::copyNode (std::uint64_t& nodeCount,
SHAMapAbstractNode const& node)
@@ -288,10 +302,11 @@ SHAMapStoreImp::run()
{
healthy_ = true;
std::shared_ptr<Ledger const> validatedLedger;
rotating_ = false;
{
std::unique_lock <std::mutex> lock (mutex_);
working_ = false;
rendezvous_.notify_all();
if (stop_)
{
stopped();
@@ -300,7 +315,6 @@ SHAMapStoreImp::run()
cond_.wait (lock);
if (newLedger_)
{
rotating_ = true;
validatedLedger = std::move(newLedger_);
}
else

13
src/ripple/app/misc/SHAMapStoreImp.h
View File

@@ -20,9 +20,9 @@
#ifndef RIPPLE_APP_MISC_SHAMAPSTOREIMP_H_INCLUDED
#define RIPPLE_APP_MISC_SHAMAPSTOREIMP_H_INCLUDED
#include <ripple/core/DatabaseCon.h>
#include <ripple/app/misc/SHAMapStore.h>
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/core/DatabaseCon.h>
#include <ripple/core/SociDB.h>
#include <ripple/nodestore/impl/Tuning.h>
#include <ripple/nodestore/DatabaseRotating.h>
@@ -94,9 +94,10 @@ private:
bool stop_ = false;
bool healthy_ = true;
mutable std::condition_variable cond_;
mutable std::condition_variable rendezvous_;
mutable std::mutex mutex_;
std::shared_ptr<Ledger const> newLedger_;
std::atomic<bool> rotating_;
std::atomic<bool> working_;
TransactionMaster& transactionMaster_;
std::atomic <LedgerIndex> canDelete_;
// these do not exist upon SHAMapStore creation, but do exist
@@ -108,12 +109,6 @@ private:
DatabaseCon* transactionDb_ = nullptr;
DatabaseCon* ledgerDb_ = nullptr;
public:
bool rotating() const
{
return rotating_;
}
public:
SHAMapStoreImp (Application& app,
Setup const& setup,
@@ -168,6 +163,8 @@ public:
void onLedgerClosed (std::shared_ptr<Ledger const> const& ledger) override;
void rendezvous() const override;
private:
// callback for visitNodes
bool copyNode (std::uint64_t& nodeCount, SHAMapAbstractNode const &node);

139
src/ripple/app/tests/SHAMapStore_test.cpp
View File

@@ -19,8 +19,10 @@
#include <BeastConfig.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/SHAMapStoreImp.h>
#include <ripple/app/misc/SHAMapStore.h>
#include <ripple/core/ConfigSections.h>
#include <ripple/core/DatabaseCon.h>
#include <ripple/core/SociDB.h>
#include <ripple/protocol/JsonFields.h>
#include <ripple/test/jtx.h>
@@ -188,14 +190,16 @@ class SHAMapStore_test : public beast::unit_test::suite
auto& store = env.app().getSHAMapStore();
int ledgerSeq = 3;
while (!store.getLastRotated())
{
env.close();
std::this_thread::sleep_for(100ms);
store.rendezvous();
expect(!store.getLastRotated());
auto ledger = env.rpc("ledger", "validated");
expect(goodLedger(env, ledger, to_string(ledgerSeq++)));
}
env.close();
store.rendezvous();
auto ledger = env.rpc("ledger", "validated");
expect(goodLedger(env, ledger, to_string(ledgerSeq++)));
expect(store.getLastRotated() == ledgerSeq - 1);
return ledgerSeq;
}
@@ -209,9 +213,7 @@ public:
Env env(*this, makeConfig());
auto store = dynamic_cast<SHAMapStoreImp*>(
&env.app().getSHAMapStore());
expect(store);
auto& store = env.app().getSHAMapStore();
env.fund(XRP(10000), noripple("alice"));
validationCheck(env, 0);
@@ -239,7 +241,10 @@ public:
ledgerTmp = env.rpc("ledger", "100");
expect(bad(ledgerTmp));
for (auto i = 4; i < deleteInterval + 4; ++i)
auto const firstSeq = waitForReady(env);
auto lastRotated = firstSeq - 1;
for (auto i = firstSeq + 1; i < deleteInterval + firstSeq; ++i)
{
env.fund(XRP(10000), noripple("test" + to_string(i)));
env.close();
@@ -247,9 +252,9 @@ public:
ledgerTmp = env.rpc("ledger", "current");
expect(goodLedger(env, ledgerTmp, to_string(i)));
}
assert(store->getLastRotated() == 3);
expect(store.getLastRotated() == lastRotated);
for (auto i = 3; i < deleteInterval + 3; ++i)
for (auto i = 3; i < deleteInterval + lastRotated; ++i)
{
ledgers.emplace(std::make_pair(i,
env.rpc("ledger", to_string(i))));
@@ -259,8 +264,8 @@ public:
validationCheck(env, 0);
ledgerCheck(env, deleteInterval + 1, 2);
transactionCheck(env, deleteInterval + 1);
accountTransactionCheck(env, 2*(deleteInterval + 1));
transactionCheck(env, deleteInterval);
accountTransactionCheck(env, 2 * deleteInterval);
{
// Since standalone doesn't _do_ validations, manually
@@ -319,8 +324,8 @@ public:
validationCheck(env, deleteInterval + 23);
ledgerCheck(env, deleteInterval + 1, 2);
transactionCheck(env, deleteInterval + 1);
accountTransactionCheck(env, 2 * (deleteInterval + 1));
transactionCheck(env, deleteInterval);
accountTransactionCheck(env, 2 * deleteInterval);
{
// Closing one more ledger triggers a rotate
@@ -330,18 +335,17 @@ public:
expect(goodLedger(env, ledger, to_string(deleteInterval + 4)));
}
while (store->rotating())
std::this_thread::sleep_for(1ms);
store.rendezvous();
expect(store->getLastRotated() == deleteInterval + 3);
auto const lastRotated = store->getLastRotated();
expect(store.getLastRotated() == deleteInterval + 3);
lastRotated = store.getLastRotated();
expect(lastRotated == 11, to_string(lastRotated));
// That took care of the fake hashes
validationCheck(env, deleteInterval + 8);
ledgerCheck(env, deleteInterval + 1, 3);
transactionCheck(env, deleteInterval + 1);
accountTransactionCheck(env, 2 * (deleteInterval + 1));
transactionCheck(env, deleteInterval);
accountTransactionCheck(env, 2 * deleteInterval);
// The last iteration of this loop should trigger a rotate
for (auto i = lastRotated - 1; i < lastRotated + deleteInterval - 1; ++i)
@@ -355,7 +359,7 @@ public:
ledgers.emplace(std::make_pair(i,
env.rpc("ledger", to_string(i))));
expect(store->getLastRotated() == lastRotated ||
expect(store.getLastRotated() == lastRotated ||
i == lastRotated + deleteInterval - 2, "lastRotated");
expect(goodLedger(env, ledgers[i], to_string(i), true) &&
getHash(ledgers[i]).length(), to_string(ledgers[i]));
@@ -376,10 +380,9 @@ public:
soci::use(ledgerSeqs);
}
while (store->rotating())
std::this_thread::sleep_for(1ms);
store.rendezvous();
expect(store->getLastRotated() == deleteInterval + lastRotated);
expect(store.getLastRotated() == deleteInterval + lastRotated);
validationCheck(env, deleteInterval - 1);
ledgerCheck(env, deleteInterval + 1, lastRotated);
@@ -395,14 +398,12 @@ public:
using namespace std::chrono_literals;
Env env(*this, makeConfig());
auto store = dynamic_cast<SHAMapStoreImp*>(
&env.app().getSHAMapStore());
expect(store);
auto& store = env.app().getSHAMapStore();
auto ledgerSeq = waitForReady(env);
auto lastRotated = ledgerSeq - 1;
expect(store->getLastRotated() == lastRotated,
to_string(store->getLastRotated()));
expect(store.getLastRotated() == lastRotated,
to_string(store.getLastRotated()));
expect(lastRotated != 2);
// Because advisory_delete is unset,
@@ -419,14 +420,13 @@ public:
expect(goodLedger(env, ledger, to_string(ledgerSeq), true));
}
while(store->rotating())
std::this_thread::sleep_for(1ms);
store.rendezvous();
// The database will always have back to ledger 2,
// regardless of lastRotated.
validationCheck(env, 0);
ledgerCheck(env, ledgerSeq - 2, 2);
expect(lastRotated == store->getLastRotated());
expect(lastRotated == store.getLastRotated());
{
// Closing one more ledger triggers a rotate
@@ -436,14 +436,13 @@ public:
expect(goodLedger(env, ledger, to_string(ledgerSeq++), true));
}
while (store->rotating())
std::this_thread::sleep_for(1ms);
store.rendezvous();
validationCheck(env, 0);
ledgerCheck(env, ledgerSeq - lastRotated, lastRotated);
expect(lastRotated != store->getLastRotated());
expect(lastRotated != store.getLastRotated());
lastRotated = store->getLastRotated();
lastRotated = store.getLastRotated();
// Close enough ledgers to trigger another rotate
for (; ledgerSeq < lastRotated + deleteInterval + 1; ++ledgerSeq)
@@ -454,12 +453,11 @@ public:
expect(goodLedger(env, ledger, to_string(ledgerSeq), true));
}
while (store->rotating())
std::this_thread::sleep_for(1ms);
store.rendezvous();
validationCheck(env, 0);
ledgerCheck(env, deleteInterval + 1, lastRotated);
expect(lastRotated != store->getLastRotated());
expect(lastRotated != store.getLastRotated());
}
void testCanDelete()
@@ -470,14 +468,12 @@ public:
// Same config with advisory_delete enabled
Env env(*this, makeConfigAdvisory());
auto store = dynamic_cast<SHAMapStoreImp*>(
&env.app().getSHAMapStore());
expect(store);
auto& store = env.app().getSHAMapStore();
auto ledgerSeq = waitForReady(env);
auto lastRotated = ledgerSeq - 1;
expect(store->getLastRotated() == lastRotated,
to_string(store->getLastRotated()));
expect(store.getLastRotated() == lastRotated,
to_string(store.getLastRotated()));
expect(lastRotated != 2);
auto canDelete = env.rpc("can_delete");
@@ -497,12 +493,11 @@ public:
expect(goodLedger(env, ledger, to_string(ledgerSeq), true));
}
while (store->rotating())
std::this_thread::sleep_for(1ms);
store.rendezvous();
validationCheck(env, 0);
ledgerCheck(env, ledgerSeq - 2, 2);
expect(lastRotated == store->getLastRotated());
expect(lastRotated == store.getLastRotated());
// This does not kick off a cleanup
canDelete = env.rpc("can_delete", to_string(
@@ -511,12 +506,11 @@ public:
expect(canDelete[jss::result][jss::can_delete] ==
ledgerSeq + deleteInterval / 2);
while (store->rotating())
std::this_thread::sleep_for(1ms);
store.rendezvous();
validationCheck(env, 0);
ledgerCheck(env, ledgerSeq - 2, 2);
expect(store->getLastRotated() == lastRotated);
expect(store.getLastRotated() == lastRotated);
{
// This kicks off a cleanup, but it stays small.
@@ -526,13 +520,12 @@ public:
expect(goodLedger(env, ledger, to_string(ledgerSeq++), true));
}
while (store->rotating())
std::this_thread::sleep_for(1ms);
store.rendezvous();
validationCheck(env, 0);
ledgerCheck(env, ledgerSeq - lastRotated, lastRotated);
expect(store->getLastRotated() == ledgerSeq - 1);
expect(store.getLastRotated() == ledgerSeq - 1);
lastRotated = ledgerSeq - 1;
for (; ledgerSeq < lastRotated + deleteInterval; ++ledgerSeq)
@@ -544,10 +537,9 @@ public:
expect(goodLedger(env, ledger, to_string(ledgerSeq), true));
}
while (store->rotating())
std::this_thread::sleep_for(1ms);
store.rendezvous();
expect(store->getLastRotated() == lastRotated);
expect(store.getLastRotated() == lastRotated);
{
// This kicks off another cleanup.
@@ -557,13 +549,12 @@ public:
expect(goodLedger(env, ledger, to_string(ledgerSeq++), true));
}
while (store->rotating())
std::this_thread::sleep_for(1ms);
store.rendezvous();
validationCheck(env, 0);
ledgerCheck(env, ledgerSeq - firstBatch, firstBatch);
expect(store->getLastRotated() == ledgerSeq - 1);
expect(store.getLastRotated() == ledgerSeq - 1);
lastRotated = ledgerSeq - 1;
// This does not kick off a cleanup
@@ -581,10 +572,9 @@ public:
expect(goodLedger(env, ledger, to_string(ledgerSeq), true));
}
while (store->rotating())
std::this_thread::sleep_for(1ms);
store.rendezvous();
expect(store->getLastRotated() == lastRotated);
expect(store.getLastRotated() == lastRotated);
{
// This kicks off another cleanup.
@@ -594,13 +584,12 @@ public:
expect(goodLedger(env, ledger, to_string(ledgerSeq++), true));
}
while (store->rotating())
std::this_thread::sleep_for(1ms);
store.rendezvous();
validationCheck(env, 0);
ledgerCheck(env, ledgerSeq - lastRotated, lastRotated);
expect(store->getLastRotated() == ledgerSeq - 1);
expect(store.getLastRotated() == ledgerSeq - 1);
lastRotated = ledgerSeq - 1;
// This does not kick off a cleanup
@@ -617,10 +606,9 @@ public:
expect(goodLedger(env, ledger, to_string(ledgerSeq), true));
}
while (store->rotating())
std::this_thread::sleep_for(1ms);
store.rendezvous();
expect(store->getLastRotated() == lastRotated);
expect(store.getLastRotated() == lastRotated);
{
// This kicks off another cleanup.
@@ -630,13 +618,12 @@ public:
expect(goodLedger(env, ledger, to_string(ledgerSeq++), true));
}
while (store->rotating())
std::this_thread::sleep_for(1ms);
store.rendezvous();
validationCheck(env, 0);
ledgerCheck(env, ledgerSeq - lastRotated, lastRotated);
expect(store->getLastRotated() == ledgerSeq - 1);
expect(store.getLastRotated() == ledgerSeq - 1);
lastRotated = ledgerSeq - 1;
}
@@ -649,7 +636,7 @@ public:
};
// VFALCO This test fails because of thread asynchronous issues
BEAST_DEFINE_TESTSUITE_MANUAL(SHAMapStore,app,ripple);
BEAST_DEFINE_TESTSUITE(SHAMapStore,app,ripple);
}
}