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

Add timeouts to crawl chunk `join()`s

This commit is contained in:
Chris Eager 2023-08-29 14:44:35 -05:00 committed by Chris Eager
parent a1e534a515
commit ecd6b0174a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,9 @@ public class AccountCleaner extends AccountDatabaseCrawlerListener {
.toList(); .toList();
try { try {
CompletableFuture.allOf(deletionFutures.toArray(new CompletableFuture[0])).join(); CompletableFuture.allOf(deletionFutures.toArray(new CompletableFuture[0]))
.orTimeout(10, TimeUnit.MINUTES)
.join();
} catch (final Exception e) { } catch (final Exception e) {
log.debug("Failed to delete one or more accounts in chunk", e); log.debug("Failed to delete one or more accounts in chunk", e);
} }

4
service/src/main/java/org/whispersystems/textsecuregcm/storage/PushFeedbackProcessor.java
View File

@ -112,7 +112,9 @@ public class PushFeedbackProcessor extends AccountDatabaseCrawlerListener {
.toList(); .toList();
try { try {
CompletableFuture.allOf(updateFutures.toArray(new CompletableFuture[0])).join(); CompletableFuture.allOf(updateFutures.toArray(new CompletableFuture[0]))
.orTimeout(10, TimeUnit.MINUTES)
.join();
} catch (final Exception e) { } catch (final Exception e) {
log.debug("Failed to update one or more accounts in chunk", e); log.debug("Failed to update one or more accounts in chunk", e);
} }