Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-22 00:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Lock accounts for the duration of deletion operations.

Browse Source
This commit is contained in:
Jon Chambers
2021-07-26 16:38:32 -04:00
committed by Jon Chambers
parent cdef745a7a
commit f47fefb73e
3 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
service/src/test/java/org/whispersystems/textsecuregcm/storage/DeletedAccountsManagerTest.java
View File

@@ -79,7 +79,7 @@ class DeletedAccountsManagerTest {
final UUID uuid = UUID.randomUUID();
final String e164 = "+18005551234";
deletedAccountsManager.addRecentlyDeletedAccount(uuid, e164);
deletedAccounts.put(uuid, e164, true);
deletedAccountsManager.lockAndTake(e164, maybeUuid -> assertEquals(Optional.of(uuid), maybeUuid));
assertEquals(Optional.empty(), deletedAccounts.findUuid(e164));
}
@@ -89,7 +89,7 @@ class DeletedAccountsManagerTest {
final UUID uuid = UUID.randomUUID();
final String e164 = "+18005551234";
deletedAccountsManager.addRecentlyDeletedAccount(uuid, e164);
deletedAccounts.put(uuid, e164, true);
deletedAccountsManager.lockAndTake(e164, maybeUuid -> {
assertEquals(Optional.of(uuid), maybeUuid);
@@ -100,7 +100,7 @@ class DeletedAccountsManagerTest {
}
@Test
void testReconciliationLockContention() throws ChunkProcessingFailedException, InterruptedException {
void testReconciliationLockContention() throws ChunkProcessingFailedException {
final UUID[] uuids = new UUID[3];
final String[] e164s = new String[uuids.length];
@@ -113,7 +113,7 @@ class DeletedAccountsManagerTest {
final Map<String, UUID> expectedReconciledAccounts = new HashMap<>();
for (int i = 0; i < uuids.length; i++) {
deletedAccountsManager.addRecentlyDeletedAccount(uuids[i], e164s[i]);
deletedAccounts.put(uuids[i], e164s[i], true);
expectedReconciledAccounts.put(e164s[i], uuids[i]);
}
@@ -122,7 +122,7 @@ class DeletedAccountsManagerTest {
final Thread putThread = new Thread(() -> {
try {
deletedAccountsManager.addRecentlyDeletedAccount(replacedUUID, e164s[0]);
deletedAccountsManager.lockAndPut(e164s[0], () -> replacedUUID);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}