AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Add blockchain lock around trimming old online account signatures to prevent deadlocks.

Browse Source
This commit is contained in:
catbref 2019-11-25 10:06:21 +00:00
parent 69bb152163
commit 3990ded802
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/qora/block/BlockChain.java
View File

@ -28,6 +28,7 @@ import org.eclipse.persistence.exceptions.XMLMarshalException;
import org.eclipse.persistence.jaxb.JAXBContextFactory; import org.eclipse.persistence.jaxb.JAXBContextFactory;
import org.eclipse.persistence.jaxb.UnmarshallerProperties; import org.eclipse.persistence.jaxb.UnmarshallerProperties;
import org.qora.controller.Controller; import org.qora.controller.Controller;
import org.qora.controller.Synchronizer.SynchronizationResult;
import org.qora.data.block.BlockData; import org.qora.data.block.BlockData;
import org.qora.network.Network; import org.qora.network.Network;
import org.qora.repository.BlockRepository; import org.qora.repository.BlockRepository;
@ -570,12 +571,21 @@ public class BlockChain {
if (repository == null) if (repository == null)
return; return;
int numBlocksTrimmed = repository.getBlockRepository().trimOldOnlineAccountsSignatures(now - BlockChain.getInstance().getOnlineAccountSignaturesMaxLifetime()); ReentrantLock blockchainLock = Controller.getInstance().getBlockchainLock();
if (!blockchainLock.tryLock())
// Too busy to trim right now, try again later
return;
if (numBlocksTrimmed > 0) try {
LOGGER.debug(String.format("Trimmed old online accounts signatures from %d block%s", numBlocksTrimmed, (numBlocksTrimmed != 1 ? "s" : ""))); int numBlocksTrimmed = repository.getBlockRepository().trimOldOnlineAccountsSignatures(now - BlockChain.getInstance().getOnlineAccountSignaturesMaxLifetime());
repository.saveChanges(); if (numBlocksTrimmed > 0)
LOGGER.debug(String.format("Trimmed old online accounts signatures from %d block%s", numBlocksTrimmed, (numBlocksTrimmed != 1 ? "s" : "")));
repository.saveChanges();
} finally {
blockchainLock.unlock();
}
} catch (DataException e) { } catch (DataException e) {
LOGGER.warn(String.format("Repository issue trying to trim old online accounts signatures: %s", e.getMessage())); LOGGER.warn(String.format("Repository issue trying to trim old online accounts signatures: %s", e.getMessage()));
} }