From b8d5b2c8ea8670e1784b77948251194d1d19e4fc Mon Sep 17 00:00:00 2001 From: Ravi Khadiwala Date: Tue, 13 May 2025 11:24:56 -0500 Subject: [PATCH] Match account idle duration in RemoveExpiredBackupsCommand --- .../textsecuregcm/workers/RemoveExpiredAccountsCommand.java | 1 - .../textsecuregcm/workers/RemoveExpiredBackupsCommand.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/RemoveExpiredAccountsCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/RemoveExpiredAccountsCommand.java index b994caa6f..6f6f5f323 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/RemoveExpiredAccountsCommand.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/RemoveExpiredAccountsCommand.java @@ -26,7 +26,6 @@ public class RemoveExpiredAccountsCommand extends AbstractSinglePassCrawlAccount private final Clock clock; - @VisibleForTesting static final Duration MAX_IDLE_DURATION = Duration.ofDays(120); @VisibleForTesting diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/RemoveExpiredBackupsCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/RemoveExpiredBackupsCommand.java index 48f2071dc..0a1af237a 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/RemoveExpiredBackupsCommand.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/RemoveExpiredBackupsCommand.java @@ -34,7 +34,7 @@ public class RemoveExpiredBackupsCommand extends AbstractCommandWithDependencies private static final String GRACE_PERIOD_ARGUMENT = "grace-period"; // A backup that has not been refreshed after a grace period is eligible for deletion - private static final Duration DEFAULT_GRACE_PERIOD = Duration.ofDays(60); + private static final Duration DEFAULT_GRACE_PERIOD = RemoveExpiredAccountsCommand.MAX_IDLE_DURATION; private static final int DEFAULT_SEGMENT_COUNT = 1; private static final int DEFAULT_CONCURRENCY = 16;