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

Add timers to `processChunk` and `deleteRecentlyDeletedUuids`

This commit is contained in:
Chris Eager 2021-09-03 14:35:08 -07:00 committed by Chris Eager
parent b1274125c9
commit 18a6df34bd
2 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawler.java
View File

@ -26,6 +26,8 @@ public class AccountDatabaseCrawler implements Managed, Runnable {
private static final Logger logger = LoggerFactory.getLogger(AccountDatabaseCrawler.class); private static final Logger logger = LoggerFactory.getLogger(AccountDatabaseCrawler.class);
private static final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME); private static final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
private static final Timer readChunkTimer = metricRegistry.timer(name(AccountDatabaseCrawler.class, "readChunk")); private static final Timer readChunkTimer = metricRegistry.timer(name(AccountDatabaseCrawler.class, "readChunk"));
private static final Timer processChunkTimer = metricRegistry.timer(
name(AccountDatabaseCrawler.class, "processChunk"));
private static final long WORKER_TTL_MS = 120_000L; private static final long WORKER_TTL_MS = 120_000L;
private static final long ACCELERATED_CHUNK_INTERVAL = 10L; private static final long ACCELERATED_CHUNK_INTERVAL = 10L;
@ -118,6 +120,9 @@ public class AccountDatabaseCrawler implements Managed, Runnable {
} }
private void processChunk() { private void processChunk() {
try (Timer.Context timer = processChunkTimer.time()) {
final boolean useDynamo = dynamicConfigurationManager.getConfiguration() final boolean useDynamo = dynamicConfigurationManager.getConfiguration()
.getAccountsDynamoDbMigrationConfiguration() .getAccountsDynamoDbMigrationConfiguration()
.isDynamoCrawlerEnabled(); .isDynamoCrawlerEnabled();
@ -149,6 +154,7 @@ public class AccountDatabaseCrawler implements Managed, Runnable {
} }
} }
} }
}
private AccountCrawlChunk readChunk(Optional<UUID> fromUuid, int chunkSize, boolean useDynamo) { private AccountCrawlChunk readChunk(Optional<UUID> fromUuid, int chunkSize, boolean useDynamo) {
try (Timer.Context timer = readChunkTimer.time()) { try (Timer.Context timer = readChunkTimer.time()) {

5
service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsDynamoDb.java
View File

@ -74,6 +74,8 @@ public class AccountsDynamoDb extends AbstractDynamoDbStore implements AccountSt
private static final Timer GET_ALL_FROM_START_TIMER = Metrics.timer(name(AccountsDynamoDb.class, "getAllFrom")); private static final Timer GET_ALL_FROM_START_TIMER = Metrics.timer(name(AccountsDynamoDb.class, "getAllFrom"));
private static final Timer GET_ALL_FROM_OFFSET_TIMER = Metrics.timer(name(AccountsDynamoDb.class, "getAllFromOffset")); private static final Timer GET_ALL_FROM_OFFSET_TIMER = Metrics.timer(name(AccountsDynamoDb.class, "getAllFromOffset"));
private static final Timer DELETE_TIMER = Metrics.timer(name(AccountsDynamoDb.class, "delete")); private static final Timer DELETE_TIMER = Metrics.timer(name(AccountsDynamoDb.class, "delete"));
private static final Timer DELETE_RECENTLY_DELETED_UUIDS_TIMER = Metrics.timer(
name(AccountsDynamoDb.class, "deleteRecentlyDeletedUuids"));
private final Logger logger = LoggerFactory.getLogger(AccountsDynamoDb.class); private final Logger logger = LoggerFactory.getLogger(AccountsDynamoDb.class);
@ -361,6 +363,8 @@ public class AccountsDynamoDb extends AbstractDynamoDbStore implements AccountSt
public void deleteRecentlyDeletedUuids() { public void deleteRecentlyDeletedUuids() {
DELETE_RECENTLY_DELETED_UUIDS_TIMER.record(() -> {
final List<UUID> recentlyDeletedUuids = migrationDeletedAccounts.getRecentlyDeletedUuids(); final List<UUID> recentlyDeletedUuids = migrationDeletedAccounts.getRecentlyDeletedUuids();
for (UUID recentlyDeletedUuid : recentlyDeletedUuids) { for (UUID recentlyDeletedUuid : recentlyDeletedUuids) {
@ -368,6 +372,7 @@ public class AccountsDynamoDb extends AbstractDynamoDbStore implements AccountSt
} }
migrationDeletedAccounts.delete(recentlyDeletedUuids); migrationDeletedAccounts.delete(recentlyDeletedUuids);
});
} }
public CompletableFuture<Boolean> migrate(Account account) { public CompletableFuture<Boolean> migrate(Account account) {