Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent that we write data at shutdown before we have read the data. #4907

Merged
merged 2 commits into from
Dec 8, 2020
Merged

Prevent that we write data at shutdown before we have read the data. #4907

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0520942
Prevent that we write data at shutdown before we have read the data.
chimp1984 Dec 7, 2020
15ed165
Move readCalled.set(true); to getPersisted(String fileName) method.
chimp1984 Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion common/src/main/java/bisq/common/persistence/PersistenceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ public static void flushAllDataToDisk(ResultHandler completeHandler) {
// For Priority.HIGH data we want to write to disk in any case to be on the safe side if we might have missed
// a requestPersistence call after an important state update. Those are usually rather small data stores.
// Otherwise we only persist if requestPersistence was called since the last persist call.
if (persistenceManager.source.flushAtShutDown || persistenceManager.persistenceRequested) {
// We also check if we have called read already to avoid a very early write attempt before we have ever
// read the data, which would lead to a write of empty data
// (fixes https://github.com/bisq-network/bisq/issues/4844).
if (persistenceManager.readCalled.get() &&
(persistenceManager.source.flushAtShutDown || persistenceManager.persistenceRequested)) {
// 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.

Expand Down Expand Up @@ -184,6 +188,7 @@ public enum Source {
private Timer timer;
private ExecutorService writeToDiskExecutor;
public final AtomicBoolean initCalled = new AtomicBoolean(false);
public final AtomicBoolean readCalled = new AtomicBoolean(false);


///////////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -303,6 +308,8 @@ public T getPersisted(String fileName) {
return null;
}

readCalled.set(true);

File storageFile = new File(dir, fileName);
if (!storageFile.exists()) {
return null;
Expand Down