From ca02cd72aeda45ede83a196d84ea8c6e3ca2b338 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sat, 2 Oct 2021 11:51:53 +0100 Subject: [PATCH] Fixed issue in block archiver, which caused it to hold a transaction open for a very long time. This caused deadlocks when trying to create bootstraps or perform repository maintenance. --- .../java/org/qortal/controller/repository/BlockArchiver.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/qortal/controller/repository/BlockArchiver.java b/src/main/java/org/qortal/controller/repository/BlockArchiver.java index 15b9b226..2bab920d 100644 --- a/src/main/java/org/qortal/controller/repository/BlockArchiver.java +++ b/src/main/java/org/qortal/controller/repository/BlockArchiver.java @@ -83,6 +83,7 @@ public class BlockArchiver implements Runnable { 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(60 * 60 * 1000L); // 1 hour break;