nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

continue shutting down on error flushing data to disk

Browse Source
This commit is contained in:
woodser 2023-04-30 11:05:06 -04:00
parent a2c0abcbc1
commit 56e61e611c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/haveno/common/persistence/PersistenceManager.java
View File

@ -150,12 +150,18 @@ public class PersistenceManager<T extends PersistableEnvelope> {
// (fixes https://github.com/bisq-network/bisq/issues/4844). // (fixes https://github.com/bisq-network/bisq/issues/4844).
if (persistenceManager.readCalled.get() && if (persistenceManager.readCalled.get() &&
(persistenceManager.source.flushAtShutDown || persistenceManager.persistenceRequested)) { (persistenceManager.source.flushAtShutDown || persistenceManager.persistenceRequested)) {
// We always get our completeHandler called even if exceptions happen. In case a file write fails // We always get our completeHandler called even if exceptions happen. In case a file write fails
// we still call our shutdown and count down routine as the completeHandler is triggered in any case. // we still call our shutdown and count down routine as the completeHandler is triggered in any case.
// We get our result handler called from the write thread so we map back to user thread. // We get our result handler called from the write thread so we map back to user thread.
persistenceManager.persistNow(() -> try {
persistenceManager.persistNow(() ->
UserThread.execute(() -> onWriteCompleted(completeHandler, openInstances, persistenceManager, doShutdown))); UserThread.execute(() -> onWriteCompleted(completeHandler, openInstances, persistenceManager, doShutdown)));
} catch (Exception e) {
if (!doShutdown) throw e; // only complete if shutting down
log.warn("Error flushing data to disk on shut down. Calling completeHandler.");
UserThread.execute(() -> onWriteCompleted(completeHandler, openInstances, persistenceManager, doShutdown));
}
} else { } else {
onWriteCompleted(completeHandler, openInstances, persistenceManager, doShutdown); onWriteCompleted(completeHandler, openInstances, persistenceManager, doShutdown);
} }