ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-28 06:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a deadlock when a transaction acquire set times out.

Browse Source
This commit is contained in:
JoelKatz
2013-07-22 04:00:24 -07:00
parent b428e94ce8
commit 6760f5efce
6 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ripple_app/ledger/ripple_InboundLedger.cpp
View File

@@ -138,7 +138,7 @@ bool InboundLedger::tryLocal ()
return mComplete; return mComplete;
} }
void InboundLedger::onTimer (bool progress) void InboundLedger::onTimer (bool progress, boost::recursive_mutex::scoped_lock&)
{ {
mRecentTXNodes.clear (); mRecentTXNodes.clear ();
mRecentASNodes.clear (); mRecentASNodes.clear ();

2
modules/ripple_app/ledger/ripple_InboundLedger.h
View File

@@ -92,7 +92,7 @@ public:
private: private:
void done (); void done ();
void onTimer (bool progress); void onTimer (bool progress, boost::recursive_mutex::scoped_lock& peerSetLock);
void newPeer (Peer::ref peer) void newPeer (Peer::ref peer)
{ {

4
src/cpp/ripple/ripple_PeerSet.cpp
View File

@@ -54,12 +54,12 @@ void PeerSet::invokeOnTimer ()
{ {
++mTimeouts; ++mTimeouts;
WriteLog (lsWARNING, InboundLedger) << "Timeout(" << mTimeouts << ") pc=" << mPeers.size () << " acquiring " << mHash; WriteLog (lsWARNING, InboundLedger) << "Timeout(" << mTimeouts << ") pc=" << mPeers.size () << " acquiring " << mHash;
onTimer (false); onTimer (false, sl);
} }
else else
{ {
mProgress = false; mProgress = false;
onTimer (true); onTimer (true, sl);
} }
if (!isDone ()) if (!isDone ())

2
src/cpp/ripple/ripple_PeerSet.h
View File

@@ -71,7 +71,7 @@ protected:
virtual ~PeerSet () { } virtual ~PeerSet () { }
virtual void newPeer (Peer::ref) = 0; virtual void newPeer (Peer::ref) = 0;
virtual void onTimer (bool progress) = 0; virtual void onTimer (bool progress, boost::recursive_mutex::scoped_lock&) = 0;
virtual boost::weak_ptr<PeerSet> pmDowncast () = 0; virtual boost::weak_ptr<PeerSet> pmDowncast () = 0;
void setComplete () void setComplete ()

22
src/cpp/ripple/ripple_TransactionAcquire.cpp
View File

@@ -44,22 +44,26 @@ void TransactionAcquire::done ()
getApp().getIOService ().post (BIND_TYPE (&TACompletionHandler, mHash, map)); getApp().getIOService ().post (BIND_TYPE (&TACompletionHandler, mHash, map));
} }
void TransactionAcquire::onTimer (bool progress) void TransactionAcquire::onTimer (bool progress, boost::recursive_mutex::scoped_lock& psl)
{ {
bool aggressive = false; bool aggressive = false;
if (getTimeouts () > 10) if (getTimeouts () > 10)
{ {
WriteLog (lsWARNING, TransactionAcquire) << "Ten timeouts on TX set " << getHash (); WriteLog (lsWARNING, TransactionAcquire) << "Ten timeouts on TX set " << getHash ();
{ { // FIXME: Acquire the master lock here can deadlock
boost::recursive_mutex::scoped_lock sl (getApp().getMasterLock ()); psl.unlock();
if (getApp().getOPs ().stillNeedTXSet (mHash))
{ {
WriteLog (lsWARNING, TransactionAcquire) << "Still need it"; boost::recursive_mutex::scoped_lock sl (getApp().getMasterLock ());
mTimeouts = 0;
aggressive = true; if (getApp().getOPs ().stillNeedTXSet (mHash))
} {
WriteLog (lsWARNING, TransactionAcquire) << "Still need it";
mTimeouts = 0;
aggressive = true;
}
}
psl.lock();
} }
if (!aggressive) if (!aggressive)

2
src/cpp/ripple/ripple_TransactionAcquire.h
View File

@@ -38,7 +38,7 @@ private:
SHAMap::pointer mMap; SHAMap::pointer mMap;
bool mHaveRoot; bool mHaveRoot;
void onTimer (bool progress); void onTimer (bool progress, boost::recursive_mutex::scoped_lock& peerSetLock);
void newPeer (Peer::ref peer) void newPeer (Peer::ref peer)
{ {
trigger (peer); trigger (peer);