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

(3/8) [REFACTOR] P2PDataStore::add/remove/refresh #3557

Merged
merged 7 commits into from
Nov 18, 2019
Merged

(3/8) [REFACTOR] P2PDataStore::add/remove/refresh #3557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de5ffd4
[BUGFIX] Don't try and remove() if addMailboxData() fails
julianknutsen Nov 3, 2019
5512f34
[REFACTOR] P2PDataStorage::addPersistableNetworkPayload()
julianknutsen Oct 26, 2019
f2f6399
[REFACTOR] P2PDataStorage::addProtectedStorageEntry()
julianknutsen Nov 4, 2019
ae50270
[REFACTOR] P2PDataStorage::refreshTTL()
julianknutsen Nov 4, 2019
a569852
[REFACTOR] P2PDataStorage::remove()
julianknutsen Nov 4, 2019
66e3ece
[REFACTOR] P2PDataStorage::removeMailboxData()
julianknutsen Nov 4, 2019
86c8c83
[PR COMMENTS] Clean up logging messages
julianknutsen Nov 5, 2019
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
10 changes: 5 additions & 5 deletions p2p/src/main/java/bisq/network/p2p/P2PService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,12 +700,12 @@ public void onBroadcastFailed(String errorMessage) {
};
boolean result = p2PDataStorage.addProtectedStorageEntry(protectedMailboxStorageEntry, networkNode.getNodeAddress(), listener, true);
if (!result) {
//TODO remove and add again with a delay to ensure the data will be broadcasted
// The p2PDataStorage.remove makes probably sense but need to be analysed more.
// Don't change that if it is not 100% clear.
sendMailboxMessageListener.onFault("Data already exists in our local database");
boolean removeResult = p2PDataStorage.remove(protectedMailboxStorageEntry, networkNode.getNodeAddress(), true);
log.debug("remove result=" + removeResult);

// This should only fail if there are concurrent calls to addProtectedStorageEntry with the
// same ProtectedMailboxStorageEntry. This is an unexpected use case so if it happens we
// want to see it, but it is not worth throwing an exception.
log.error("Unexpected state: adding mailbox message that already exists.");
}
} catch (CryptoException e) {
log.error("Signing at getDataWithSignedSeqNr failed. That should never happen.");
Expand Down
Loading