MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Temporarily disable account cleaner

This commit is contained in:
Moxie Marlinspike 2019-05-03 12:04:18 -07:00
parent 743975db52
commit a1f90cd39b
2 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java
View File

@ -59,16 +59,16 @@ public class AccountCleaner implements AccountDatabaseCrawlerListener {
{
expiredAccountsMeter.mark();
Device masterDevice = account.getMasterDevice().get();
masterDevice.setFetchesMessages(false);
masterDevice.setApnId(null);
masterDevice.setGcmId(null);
if (accountUpdateCount < MAX_ACCOUNT_UPDATES_PER_CHUNK) {
accountUpdateCount++;
accountsManager.update(account);
}
directoryQueue.deleteRegisteredUser(account.getNumber());
// Device masterDevice = account.getMasterDevice().get();
// masterDevice.setFetchesMessages(false);
// masterDevice.setApnId(null);
// masterDevice.setGcmId(null);
//
// if (accountUpdateCount < MAX_ACCOUNT_UPDATES_PER_CHUNK) {
// accountUpdateCount++;
// accountsManager.update(account);
// }
// directoryQueue.deleteRegisteredUser(account.getNumber());
}
}
}

130
service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountCleanerTest.java
View File

@ -127,72 +127,72 @@ public class AccountCleanerTest {
verifyNoMoreInteractions(directoryQueue);
}
@Test
public void testExpiredAccounts() {
AccountCleaner accountCleaner = new AccountCleaner(accountsManager, directoryQueue);
accountCleaner.onCrawlStart();
accountCleaner.onCrawlChunk(Optional.empty(), Arrays.asList(activeUnexpiredAccount, activeExpiredAccount, inactiveUnexpiredAccount, inactiveExpiredAccount));
accountCleaner.onCrawlEnd(Optional.empty());
// @Test
// public void testExpiredAccounts() {
// AccountCleaner accountCleaner = new AccountCleaner(accountsManager, directoryQueue);
// accountCleaner.onCrawlStart();
// accountCleaner.onCrawlChunk(Optional.empty(), Arrays.asList(activeUnexpiredAccount, activeExpiredAccount, inactiveUnexpiredAccount, inactiveExpiredAccount));
// accountCleaner.onCrawlEnd(Optional.empty());
//
// verify(activeExpiredDevice).setGcmId(isNull());
// verify(activeExpiredDevice).setApnId(isNull());
// verify(activeExpiredDevice).setFetchesMessages(eq(false));
//
// verify(accountsManager).update(eq(activeExpiredAccount));
// verify(directoryQueue).deleteRegisteredUser(eq(AuthHelper.VALID_NUMBER));
//
// verify(activeUnexpiredDevice, atLeastOnce()).isActive();
// verify(activeExpiredDevice, atLeastOnce()).isActive();
// verify(inactiveUnexpiredDevice, atLeastOnce()).isActive();
// verify(inactiveExpiredDevice, atLeastOnce()).isActive();
//
// verifyNoMoreInteractions(activeUnexpiredDevice);
// verifyNoMoreInteractions(activeExpiredDevice);
// verifyNoMoreInteractions(inactiveUnexpiredDevice);
// verifyNoMoreInteractions(inactiveExpiredDevice);
//
// verifyNoMoreInteractions(accountsManager);
// verifyNoMoreInteractions(directoryQueue);
// }
verify(activeExpiredDevice).setGcmId(isNull());
verify(activeExpiredDevice).setApnId(isNull());
verify(activeExpiredDevice).setFetchesMessages(eq(false));
verify(accountsManager).update(eq(activeExpiredAccount));
verify(directoryQueue).deleteRegisteredUser(eq(AuthHelper.VALID_NUMBER));
verify(activeUnexpiredDevice, atLeastOnce()).isActive();
verify(activeExpiredDevice, atLeastOnce()).isActive();
verify(inactiveUnexpiredDevice, atLeastOnce()).isActive();
verify(inactiveExpiredDevice, atLeastOnce()).isActive();
verifyNoMoreInteractions(activeUnexpiredDevice);
verifyNoMoreInteractions(activeExpiredDevice);
verifyNoMoreInteractions(inactiveUnexpiredDevice);
verifyNoMoreInteractions(inactiveExpiredDevice);
verifyNoMoreInteractions(accountsManager);
verifyNoMoreInteractions(directoryQueue);
}
@Test
public void testMaxAccountUpdates() {
ArrayList<Account> accounts = new ArrayList<>();
accounts.add(activeUnexpiredAccount);
int activeExpiredAccountCount = AccountCleaner.MAX_ACCOUNT_UPDATES_PER_CHUNK + 1;
for (int addedAccountCount = 0; addedAccountCount < activeExpiredAccountCount; addedAccountCount++) {
accounts.add(activeExpiredAccount);
}
accounts.add(inactiveUnexpiredAccount);
accounts.add(inactiveExpiredAccount);
AccountCleaner accountCleaner = new AccountCleaner(accountsManager, directoryQueue);
accountCleaner.onCrawlStart();
accountCleaner.onCrawlChunk(Optional.empty(), accounts);
accountCleaner.onCrawlEnd(Optional.empty());
verify(activeExpiredDevice, atLeast(0)).setGcmId(isNull());
verify(activeExpiredDevice, atLeast(0)).setApnId(isNull());
verify(activeExpiredDevice, atLeast(0)).setFetchesMessages(eq(false));
verify(accountsManager, times(AccountCleaner.MAX_ACCOUNT_UPDATES_PER_CHUNK)).update(eq(activeExpiredAccount));
verify(directoryQueue, times(activeExpiredAccountCount)).deleteRegisteredUser(eq(AuthHelper.VALID_NUMBER));
verify(activeUnexpiredDevice, atLeastOnce()).isActive();
verify(activeExpiredDevice, atLeastOnce()).isActive();
verify(inactiveUnexpiredDevice, atLeastOnce()).isActive();
verify(inactiveExpiredDevice, atLeastOnce()).isActive();
verifyNoMoreInteractions(activeUnexpiredDevice);
verifyNoMoreInteractions(activeExpiredDevice);
verifyNoMoreInteractions(inactiveUnexpiredDevice);
verifyNoMoreInteractions(inactiveExpiredDevice);
verifyNoMoreInteractions(accountsManager);
verifyNoMoreInteractions(directoryQueue);
}
// @Test
// public void testMaxAccountUpdates() {
// ArrayList<Account> accounts = new ArrayList<>();
// accounts.add(activeUnexpiredAccount);
//
// int activeExpiredAccountCount = AccountCleaner.MAX_ACCOUNT_UPDATES_PER_CHUNK + 1;
// for (int addedAccountCount = 0; addedAccountCount < activeExpiredAccountCount; addedAccountCount++) {
// accounts.add(activeExpiredAccount);
// }
//
// accounts.add(inactiveUnexpiredAccount);
// accounts.add(inactiveExpiredAccount);
//
// AccountCleaner accountCleaner = new AccountCleaner(accountsManager, directoryQueue);
// accountCleaner.onCrawlStart();
// accountCleaner.onCrawlChunk(Optional.empty(), accounts);
// accountCleaner.onCrawlEnd(Optional.empty());
//
// verify(activeExpiredDevice, atLeast(0)).setGcmId(isNull());
// verify(activeExpiredDevice, atLeast(0)).setApnId(isNull());
// verify(activeExpiredDevice, atLeast(0)).setFetchesMessages(eq(false));
//
// verify(accountsManager, times(AccountCleaner.MAX_ACCOUNT_UPDATES_PER_CHUNK)).update(eq(activeExpiredAccount));
// verify(directoryQueue, times(activeExpiredAccountCount)).deleteRegisteredUser(eq(AuthHelper.VALID_NUMBER));
//
// verify(activeUnexpiredDevice, atLeastOnce()).isActive();
// verify(activeExpiredDevice, atLeastOnce()).isActive();
// verify(inactiveUnexpiredDevice, atLeastOnce()).isActive();
// verify(inactiveExpiredDevice, atLeastOnce()).isActive();
//
// verifyNoMoreInteractions(activeUnexpiredDevice);
// verifyNoMoreInteractions(activeExpiredDevice);
// verifyNoMoreInteractions(inactiveUnexpiredDevice);
// verifyNoMoreInteractions(inactiveExpiredDevice);
//
// verifyNoMoreInteractions(accountsManager);
// verifyNoMoreInteractions(directoryQueue);
// }
@Test