Signal/Signal-Server
1
0 Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-10-05 20:07:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add timeouts to crawl chunk join()s

Browse Source
This commit is contained in:
Chris Eager authored and Chris Eager committed 2023-08-31 15:03:19 -05:00
1 parent a1e534a515
commit ecd6b0174a
2 files changed
+6 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java
+3 -1
View File
@@ -61,7 +61,9 @@ public class AccountCleaner extends AccountDatabaseCrawlerListener {
.toList();
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) {
log.debug("Failed to delete one or more accounts in chunk", e);
}
service/src/main/java/org/whispersystems/textsecuregcm/storage/PushFeedbackProcessor.java
+3 -1
View File
@@ -112,7 +112,9 @@ public class PushFeedbackProcessor extends AccountDatabaseCrawlerListener {
.toList();
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) {
log.debug("Failed to update one or more accounts in chunk", e);
}