BlockMinter now only acquires repository instance as needed to prevent long HSQLDB rollbacks

src/main/java/org/qortal/controller/BlockMinter.java

@@ -65,9 +65,8 @@ public class BlockMinter extends Thread {
 			// Lite nodes do not mint
 			return;
 		}
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
 		if (Settings.getInstance().getWipeUnconfirmedOnStart()) {
+			try (final Repository repository = RepositoryManager.getRepository()) {
 				// Wipe existing unconfirmed transactions
 				List<TransactionData> unconfirmedTransactions = repository.getTransactionRepository().getUnconfirmedTransactions();
 
@@ -77,10 +76,12 @@ public class BlockMinter extends Thread {
 				}
 
 				repository.saveChanges();
+			} catch (DataException e) {
+				LOGGER.warn("Repository issue trying to wipe unconfirmed transactions on start-up: {}", e.getMessage());
+				// Fall-through to normal behaviour in case we can recover
+			}
 		}
 
-			// Going to need this a lot...
-			BlockRepository blockRepository = repository.getBlockRepository();
 		BlockData previousBlockData = null;
 
 		// Vars to keep track of blocks that were skipped due to chain weight
@@ -94,13 +95,12 @@ public class BlockMinter extends Thread {
 		boolean isMintingPossible = false;
 		boolean wasMintingPossible = isMintingPossible;
 		while (running) {
-				repository.discardChanges(); // Free repository locks, if any
-
 			if (isMintingPossible != wasMintingPossible)
 				Controller.getInstance().onMintingPossibleChange(isMintingPossible);
 
 			wasMintingPossible = isMintingPossible;
 
+			try {
 				// Sleep for a while
 				Thread.sleep(1000);
 
@@ -118,6 +118,10 @@ public class BlockMinter extends Thread {
 				if (!OnlineAccountsManager.getInstance().hasOnlineAccounts())
 					continue;
 
+				try (final Repository repository = RepositoryManager.getRepository()) {
+					// Going to need this a lot...
+					BlockRepository blockRepository = repository.getBlockRepository();
+
 					List<MintingAccountData> mintingAccountsData = repository.getAccountRepository().getMintingAccounts();
 					// No minting accounts?
 					if (mintingAccountsData.isEmpty())
@@ -194,6 +198,10 @@ public class BlockMinter extends Thread {
 					// so go ahead and mint a block if possible.
 					isMintingPossible = true;
 
+					// Reattach newBlocks to new repository handle
+					for (Block newBlock : newBlocks)
+						newBlock.setRepository(repository);
+
 					// Check blockchain hasn't changed
 					if (previousBlockData == null || !Arrays.equals(previousBlockData.getSignature(), lastBlockData.getSignature())) {
 						previousBlockData = lastBlockData;
@@ -224,7 +232,7 @@ public class BlockMinter extends Thread {
 						// The last iteration found a higher weight block in the network, so sleep for a while
 						// to allow is to sync the higher weight chain. We are sleeping here rather than when
 						// detected as we don't want to hold the blockchain lock open.
-					LOGGER.debug("Sleeping for 10 seconds...");
+						LOGGER.info("Sleeping for 10 seconds...");
 						Thread.sleep(10 * 1000L);
 					}
 
@@ -333,16 +341,14 @@ public class BlockMinter extends Thread {
 								// If less than 30 seconds has passed since first detection the higher weight chain,
 								// we should skip our block submission to give us the opportunity to sync to the better chain
 								if (NTP.getTime() - timeOfLastLowWeightBlock < 30 * 1000L) {
-								LOGGER.debug("Higher weight chain found in peers, so not signing a block this round");
+									LOGGER.info("Higher weight chain found in peers, so not signing a block this round");
-								LOGGER.debug("Time since detected: {}ms", NTP.getTime() - timeOfLastLowWeightBlock);
+									LOGGER.info("Time since detected: {}", NTP.getTime() - timeOfLastLowWeightBlock);
 									continue;
-							}
+								} else {
-							else {
 									// More than 30 seconds have passed, so we should submit our block candidate anyway.
-								LOGGER.debug("More than 30 seconds passed, so proceeding to submit block candidate...");
+									LOGGER.info("More than 30 seconds passed, so proceeding to submit block candidate...");
 								}
-						}
+							} else {
-						else {
 								LOGGER.debug("No higher weight chain found in peers");
 							}
 						} catch (DataException e) {
@@ -356,7 +362,6 @@ public class BlockMinter extends Thread {
 						parentSignatureForLastLowWeightBlock = null;
 						timeOfLastLowWeightBlock = null;
 
-
 						// Add unconfirmed transactions
 						addUnconfirmedTransactions(repository, newBlock);
 
@@ -421,14 +426,15 @@ public class BlockMinter extends Thread {
 						Network network = Network.getInstance();
 						network.broadcast(broadcastPeer -> network.buildHeightMessage(broadcastPeer, newBlockData));
 					}
-			}
 				} catch (DataException e) {
 					LOGGER.warn("Repository issue while running block minter", e);
+				}
 			} catch (InterruptedException e) {
 				// We've been interrupted - time to exit
 				return;
 			}
 		}
+	}
 
 	/**
 	 * Adds unconfirmed transactions to passed block.