Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-03 05:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust stall period to 15 seconds and min speed to 5 kB/s. The previous 6 seconds caused otherwise quick peers to be disconnected too often. Also, fixed a compare bug and a comment.

Browse Source
This commit is contained in:
Andreas Schildbach
2015-03-14 13:10:31 +01:00
parent 7e12da357c
commit c6ee7449c3
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/org/bitcoinj/core/PeerGroup.java
View File

@@ -1464,9 +1464,8 @@ public class PeerGroup implements TransactionBroadcaster {
private class ChainDownloadSpeedCalculator extends AbstractPeerEventListener implements Runnable {
private int blocksInLastSecond, txnsInLastSecond, origTxnsInLastSecond, stallWarning;
private static final int STALL_PERIOD_SECONDS = 6;
private static final int STALL_MIN_SPEED = 10;
private static final int STALL_PERIOD_SECONDS = 15;
private static final int STALL_MIN_SPEED = 5;
@Override
public synchronized void onBlocksDownloaded(Peer peer, Block block, @Nullable FilteredBlock filteredBlock, int blocksLeft) {
@@ -1482,9 +1481,9 @@ public class PeerGroup implements TransactionBroadcaster {
@Override
public synchronized void run() {
if (blocksInLastSecond > 1) {
if (blocksInLastSecond > 0) {
log.info("{} blocks/sec, {} tx/sec, {} pre-filtered tx/sec", blocksInLastSecond, txnsInLastSecond, origTxnsInLastSecond);
if (blocksInLastSecond > STALL_MIN_SPEED)
if (blocksInLastSecond >= STALL_MIN_SPEED)
stallWarning = 0;
}
if (chain != null && chain.getBestChainHeight() < getMostCommonChainHeight() && blocksInLastSecond < STALL_MIN_SPEED && stallWarning > -1) {
@@ -1492,7 +1491,7 @@ public class PeerGroup implements TransactionBroadcaster {
if (stallWarning == STALL_PERIOD_SECONDS) {
stallWarning = -1;
Peer peer = getDownloadPeer();
log.warn("Chain download stalled: no progress for {} seconds, disconnecting {}", STALL_PERIOD_SECONDS, peer);
log.warn("Chain download stalled: slow progress for {} seconds, disconnecting {}", STALL_PERIOD_SECONDS, peer);
peer.close();
}
}