Qortal/qortal
1
0
Fork 0
mirror of https://github.com/Qortal/qortal.git synced 2025-04-29 14:27:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

added alpha's changes together with kenny's to make final BlockArchiver.java

Browse Source
This commit is contained in:
crowetic 2024-11-06 09:07:37 -08:00
parent 497259f652
commit 2c017fc1b0
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/qortal/controller/repository/BlockArchiver.java
View File

@ -52,29 +52,9 @@ public class BlockArchiver implements Runnable {
Thread.sleep(Settings.getInstance().getArchiveInterval()); Thread.sleep(Settings.getInstance().getArchiveInterval());
<<<<<<< HEAD
BlockData chainTip = Controller.getInstance().getChainTip(); BlockData chainTip = Controller.getInstance().getChainTip();
if (chainTip == null || NTP.getTime() == null) { if (chainTip == null || NTP.getTime() == null) {
continue; continue;
=======
// We've reached the limit of the blocks we can archive
// Sleep for a while to allow more to become available
case NOT_ENOUGH_BLOCKS:
// We didn't reach our file size target, so that must mean that we don't have enough blocks
// yet or something went wrong. Sleep for a while and then try again.
repository.discardChanges();
Thread.sleep(2 * 60 * 60 * 1000L); // 2 hour around 100 blocks
break;
case BLOCK_NOT_FOUND:
// We tried to archive a block that didn't exist. This is a major failure and likely means
// that a bootstrap or re-sync is needed. Try again every minute until then.
LOGGER.info("Error: block not found when building archive. If this error persists, " +
"a bootstrap or re-sync may be needed.");
repository.discardChanges();
Thread.sleep(60 * 1000L); // 1 minute
break;
>>>>>>> alphax/master
} }
// Don't even attempt if we're mid-sync as our repository requests will be delayed for ages // Don't even attempt if we're mid-sync as our repository requests will be delayed for ages
@ -88,7 +68,6 @@ public class BlockArchiver implements Runnable {
continue; continue;
} }
// Build cache of blocks // Build cache of blocks
try { try {
final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository); final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
@ -111,7 +90,7 @@ public class BlockArchiver implements Runnable {
// We didn't reach our file size target, so that must mean that we don't have enough blocks // We didn't reach our file size target, so that must mean that we don't have enough blocks
// yet or something went wrong. Sleep for a while and then try again. // yet or something went wrong. Sleep for a while and then try again.
repository.discardChanges(); repository.discardChanges();
Thread.sleep(60 * 60 * 1000L); // 1 hour Thread.sleep(2 * 60 * 60 * 1000L); // 1 hour
break; break;
case BLOCK_NOT_FOUND: case BLOCK_NOT_FOUND: