Don't send redundant fetch requests.

This commit is contained in:
JoelKatz
2013-06-17 13:26:18 -07:00
parent e6c4eda156
commit b1aa893b59
2 changed files with 5 additions and 6 deletions

View File

@@ -284,8 +284,7 @@ void LedgerAcquire::trigger (Peer::ref peer)
if ((mWaitCount > 0) && peer)
{
mRecentPeers.push_back (peer->getPeerId ());
WriteLog (lsTRACE, LedgerAcquire) << "Deferring peer";
WriteLog (lsTRACE, LedgerAcquire) << "Skipping peer";
return;
}
@@ -396,6 +395,7 @@ void LedgerAcquire::trigger (Peer::ref peer)
* (tmGL.add_nodeids ()) = SHAMapNode ().getRawString ();
WriteLog (lsTRACE, LedgerAcquire) << "Sending TX root request to " << (peer ? "selected peer" : "all peers");
sendRequest (tmGL, peer);
return;
}
else
{
@@ -433,6 +433,7 @@ void LedgerAcquire::trigger (Peer::ref peer)
WriteLog (lsTRACE, LedgerAcquire) << "Sending TX node " << nodeIDs.size ()
<< " request to " << (peer ? "selected peer" : "all peers");
sendRequest (tmGL, peer);
return;
}
}
}
@@ -449,6 +450,7 @@ void LedgerAcquire::trigger (Peer::ref peer)
* (tmGL.add_nodeids ()) = SHAMapNode ().getRawString ();
WriteLog (lsTRACE, LedgerAcquire) << "Sending AS root request to " << (peer ? "selected peer" : "all peers");
sendRequest (tmGL, peer);
return;
}
else
{
@@ -485,13 +487,12 @@ void LedgerAcquire::trigger (Peer::ref peer)
<< " request to " << (peer ? "selected peer" : "all peers");
CondLog (nodeIDs.size () == 1, lsTRACE, LedgerAcquire) << "AS node: " << nodeIDs[0];
sendRequest (tmGL, peer);
return;
}
}
}
}
mRecentPeers.clear ();
if (mComplete || mFailed)
{
WriteLog (lsDEBUG, LedgerAcquire) << "Done:" << (mComplete ? " complete" : "") << (mFailed ? " failed " : " ")

View File

@@ -109,8 +109,6 @@ private:
std::set <SHAMapNode> mRecentTXNodes;
std::set <SHAMapNode> mRecentASNodes;
std::vector <uint64> mRecentPeers;
std::vector <FUNCTION_TYPE <void (LedgerAcquire::pointer)> > mOnComplete;
};