Qortal
/
qortal
mirror of https://github.com/qortal/qortal
3
0
Fork 2
Code Issues Projects Releases Wiki Activity
Browse Source

Fix Synchronizer bugs 

Synchronizer incorrectly tried to compare chain weights in the case
where we had no extra blocks after common block, and thus no blocks
to actually compare.

During chain compare, when more block summaries are needed from peer,
the block signature sent to peer wasn't updated from the last batch
and so the same common block signature was sent. This caused the
code to incorrectly bail out with
"Peer respond with invalid block summary" error as the block heights
didn't match.

Post chain-compare/orphan (if any), and when fetching block signatures,
the code referenced peerBlockSummaries where it should have been
referencing peerBlockSignatures instead. This caused to code to incorrectly
bail out with the "Peer failed to respond with more block signatures..."
error.
pull/67/head
catbref 5 years ago
parent
381c032cec
commit
1016d0ca16
1 changed files with 61 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 118
      src/main/java/org/qora/controller/Synchronizer.java

118
src/main/java/org/qora/controller/Synchronizer.java
Unescape View File

@ -103,10 +103,12 @@ public class Synchronizer {
} }
// First summary is common block // First summary is common block
BlockData commonBlockData = repository.getBlockRepository().fromSignature(peerBlockSummaries.get(0).getSignature()); final BlockData commonBlockData = repository.getBlockRepository().fromSignature(peerBlockSummaries.get(0).getSignature());
final int commonBlockHeight = commonBlockData.getHeight(); final int commonBlockHeight = commonBlockData.getHeight();
final byte[] commonBlockSig = commonBlockData.getSignature();
final String commonBlockSig58 = Base58.encode(commonBlockSig);
LOGGER.debug(String.format("Common block with peer %s is at height %d, sig %.8s, ts %d", peer, LOGGER.debug(String.format("Common block with peer %s is at height %d, sig %.8s, ts %d", peer,
commonBlockHeight, Base58.encode(commonBlockData.getSignature()), commonBlockData.getTimestamp())); commonBlockHeight, commonBlockSig58, commonBlockData.getTimestamp()));
peerBlockSummaries.remove(0); peerBlockSummaries.remove(0);
// If common block height is higher than peer's last reported height // If common block height is higher than peer's last reported height
@ -133,75 +135,76 @@ public class Synchronizer {
return SynchronizationResult.TOO_DIVERGENT; return SynchronizationResult.TOO_DIVERGENT;
} }
// At this point, we both have blocks after common block // Unless we're doing a forced sync, we might need to compare blocks after common block
if (!force && ourInitialHeight > commonBlockHeight) {
// If our latest block is very old, we're very behind and should ditch our fork.
final Long minLatestBlockTimestamp = Controller.getMinimumLatestBlockTimestamp();
if (minLatestBlockTimestamp == null)
return SynchronizationResult.REPOSITORY_ISSUE;
// If our latest block is very old, we're very behind and should ditch our fork. if (ourLatestBlockData.getTimestamp() < minLatestBlockTimestamp) {
final Long minLatestBlockTimestamp = Controller.getMinimumLatestBlockTimestamp(); LOGGER.info(String.format("Ditching our chain after height %d as our latest block is very old", commonBlockHeight));
if (minLatestBlockTimestamp == null) } else {
return SynchronizationResult.REPOSITORY_ISSUE; // Compare chain weights
if (ourInitialHeight > commonBlockHeight && ourLatestBlockData.getTimestamp() < minLatestBlockTimestamp) { LOGGER.debug(String.format("Comparing chains from block %d with peer %s", commonBlockHeight + 1, peer));
LOGGER.info(String.format("Ditching our chain after height %d as our latest block is very old", commonBlockHeight));
} else if (!force) {
// Compare chain weights
LOGGER.debug(String.format("Comparing chains from block %d with peer %s", commonBlockHeight + 1, peer)); // Fetch remaining peer's block summaries (which we also use to fill signatures list)
int peerBlockCount = peerHeight - commonBlockHeight;
// Fetch remaining peer's block summaries (which we also use to fill signatures list) while (peerBlockSummaries.size() < peerBlockCount) {
int peerBlockCount = peerHeight - commonBlockHeight; int lastSummaryHeight = commonBlockHeight + peerBlockSummaries.size();
byte[] previousSignature; byte[] previousSignature;
if (peerBlockSummaries.isEmpty()) if (peerBlockSummaries.isEmpty())
previousSignature = commonBlockData.getSignature(); previousSignature = commonBlockSig;
else else
previousSignature = peerBlockSummaries.get(peerBlockSummaries.size() - 1).getSignature(); previousSignature = peerBlockSummaries.get(peerBlockSummaries.size() - 1).getSignature();
while (peerBlockSummaries.size() < peerBlockCount) {
int lastSummaryHeight = commonBlockHeight + peerBlockSummaries.size();
List<BlockSummaryData> moreBlockSummaries = this.getBlockSummaries(peer, previousSignature, peerBlockCount - peerBlockSummaries.size()); List<BlockSummaryData> moreBlockSummaries = this.getBlockSummaries(peer, previousSignature, peerBlockCount - peerBlockSummaries.size());
if (moreBlockSummaries == null || moreBlockSummaries.isEmpty()) { if (moreBlockSummaries == null || moreBlockSummaries.isEmpty()) {
LOGGER.info(String.format("Peer %s failed to respond with block summaries after height %d, sig %.8s", peer, LOGGER.info(String.format("Peer %s failed to respond with block summaries after height %d, sig %.8s", peer,
lastSummaryHeight, Base58.encode(previousSignature))); lastSummaryHeight, Base58.encode(previousSignature)));
return SynchronizationResult.NO_REPLY; return SynchronizationResult.NO_REPLY;
} }
// Check peer sent valid heights // Check peer sent valid heights
for (int i = 0; i < moreBlockSummaries.size(); ++i) { for (int i = 0; i < moreBlockSummaries.size(); ++i) {
++lastSummaryHeight; ++lastSummaryHeight;
BlockSummaryData blockSummary = moreBlockSummaries.get(i); BlockSummaryData blockSummary = moreBlockSummaries.get(i);
if (blockSummary.getHeight() != lastSummaryHeight) { if (blockSummary.getHeight() != lastSummaryHeight) {
LOGGER.info(String.format("Peer %s responded with invalid block summary for height %d, sig %.8s", peer, LOGGER.info(String.format("Peer %s responded with invalid block summary for height %d, sig %.8s", peer,
lastSummaryHeight, Base58.encode(blockSummary.getSignature()))); lastSummaryHeight, Base58.encode(blockSummary.getSignature())));
return SynchronizationResult.NO_REPLY; return SynchronizationResult.NO_REPLY;
}
} }
}
peerBlockSummaries.addAll(moreBlockSummaries); peerBlockSummaries.addAll(moreBlockSummaries);
} }
// Fetch our corresponding block summaries // Fetch our corresponding block summaries
List<BlockSummaryData> ourBlockSummaries = repository.getBlockRepository().getBlockSummaries(commonBlockHeight + 1, ourInitialHeight); List<BlockSummaryData> ourBlockSummaries = repository.getBlockRepository().getBlockSummaries(commonBlockHeight + 1, ourInitialHeight);
// Calculate cumulative chain weights of both blockchain subsets, from common block to highest mutual block. // Calculate cumulative chain weights of both blockchain subsets, from common block to highest mutual block.
BigInteger ourChainWeight = Block.calcChainWeight(commonBlockHeight, commonBlockData.getSignature(), ourBlockSummaries); BigInteger ourChainWeight = Block.calcChainWeight(commonBlockHeight, commonBlockSig, ourBlockSummaries);
BigInteger peerChainWeight = Block.calcChainWeight(commonBlockHeight, commonBlockData.getSignature(), peerBlockSummaries); BigInteger peerChainWeight = Block.calcChainWeight(commonBlockHeight, commonBlockSig, peerBlockSummaries);
// If our blockchain has greater weight then don't synchronize with peer // If our blockchain has greater weight then don't synchronize with peer
if (ourChainWeight.compareTo(peerChainWeight) >= 0) { if (ourChainWeight.compareTo(peerChainWeight) >= 0) {
LOGGER.debug(String.format("Not synchronizing with peer %s as we have better blockchain", peer)); LOGGER.debug(String.format("Not synchronizing with peer %s as we have better blockchain", peer));
NumberFormat formatter = new DecimalFormat("0.###E0"); NumberFormat formatter = new DecimalFormat("0.###E0");
LOGGER.debug(String.format("Our chain weight: %s, peer's chain weight: %s (higher is better)", formatter.format(ourChainWeight), formatter.format(peerChainWeight))); LOGGER.debug(String.format("Our chain weight: %s, peer's chain weight: %s (higher is better)", formatter.format(ourChainWeight), formatter.format(peerChainWeight)));
return SynchronizationResult.INFERIOR_CHAIN; return SynchronizationResult.INFERIOR_CHAIN;
}
} }
} }
int ourHeight = ourInitialHeight; int ourHeight = ourInitialHeight;
if (ourHeight > commonBlockHeight) { if (ourHeight > commonBlockHeight) {
// Unwind to common block (unless common block is our latest block) // Unwind to common block (unless common block is our latest block)
LOGGER.debug(String.format("Orphaning blocks back to height %d", commonBlockHeight)); LOGGER.debug(String.format("Orphaning blocks back to common block height %d, sig %.8s", commonBlockHeight, commonBlockSig58));
while (ourHeight > commonBlockHeight) { while (ourHeight > commonBlockHeight) {
BlockData blockData = repository.getBlockRepository().fromHeight(ourHeight); BlockData blockData = repository.getBlockRepository().fromHeight(ourHeight);
@ -211,13 +214,13 @@ public class Synchronizer {
--ourHeight; --ourHeight;
} }
LOGGER.debug(String.format("Orphaned blocks back to height %d - fetching blocks from peer", commonBlockHeight, peer)); LOGGER.debug(String.format("Orphaned blocks back to height %d, sig %.8s - fetching blocks from peer", commonBlockHeight, commonBlockSig58, peer));
} else { } else {
LOGGER.debug(String.format("Fetching new blocks from peer %s", peer)); LOGGER.debug(String.format("Fetching new blocks from peer %s", peer));
} }
// Fetch, and apply, blocks from peer // Fetch, and apply, blocks from peer
byte[] latestPeerSignature = commonBlockData.getSignature(); byte[] latestPeerSignature = commonBlockSig;
int maxBatchHeight = commonBlockHeight + SYNC_BATCH_SIZE; int maxBatchHeight = commonBlockHeight + SYNC_BATCH_SIZE;
// Convert any block summaries from above into signatures to request from peer // Convert any block summaries from above into signatures to request from peer
@ -225,19 +228,20 @@ public class Synchronizer {
while (ourHeight < peerHeight && ourHeight < maxBatchHeight) { while (ourHeight < peerHeight && ourHeight < maxBatchHeight) {
// Do we need more signatures? // Do we need more signatures?
if (peerBlockSummaries.isEmpty()) { if (peerBlockSignatures.isEmpty()) {
int numberRequested = maxBatchHeight - ourHeight; int numberRequested = maxBatchHeight - ourHeight;
LOGGER.trace(String.format("Requesting %d signature%s after height %d", numberRequested, (numberRequested != 1 ? "s": ""), ourHeight)); LOGGER.trace(String.format("Requesting %d signature%s after height %d, sig %.8s",
numberRequested, (numberRequested != 1 ? "s": ""), ourHeight, Base58.encode(latestPeerSignature)));
peerBlockSignatures = this.getBlockSignatures(peer, latestPeerSignature, numberRequested); peerBlockSignatures = this.getBlockSignatures(peer, latestPeerSignature, numberRequested);
if (peerBlockSummaries == null || peerBlockSummaries.isEmpty()) { if (peerBlockSignatures == null || peerBlockSignatures.isEmpty()) {
LOGGER.info(String.format("Peer %s failed to respond with more block signatures after height %d, sig %.8s", peer, LOGGER.info(String.format("Peer %s failed to respond with more block signatures after height %d, sig %.8s", peer,
ourHeight, Base58.encode(latestPeerSignature))); ourHeight, Base58.encode(latestPeerSignature)));
return SynchronizationResult.NO_REPLY; return SynchronizationResult.NO_REPLY;
} }
LOGGER.trace(String.format("Received %s signature%s", peerBlockSummaries.size(), (peerBlockSummaries.size() != 1 ? "s" : ""))); LOGGER.trace(String.format("Received %s signature%s", peerBlockSignatures.size(), (peerBlockSignatures.size() != 1 ? "s" : "")));
} }
latestPeerSignature = peerBlockSignatures.get(0); latestPeerSignature = peerBlockSignatures.get(0);

Write Preview
Loading…
Cancel
Save