commit 6e0b0fa671244a30e60d1d3f9de03051c2aa76b2
author Alex Buynytskyy <alexbuy@google.com> Mon Jun 28 11:40:18 2021 -0700
committer Alex Buynytskyy <alexbuy@google.com> Mon Jun 28 23:06:49 2021 +0000
tree d5f58f26ffd2fdd39252129196626eba1f94a46d
parent 64051356de37cd167c409d0f374475d4b7843658

Reduce timeout for DL to destroy.

10secs should be more than enough to stop whatever the DL is doing.
Besides, DL has its own set of IncFS FDs and should not crash.

Bug: 189222575
Fixes: 189222575
Test: atest IncrementalServiceTest
Change-Id: I73cb27d61c7418adeea7536c8263e6ba8c77fd3e

services/incremental/IncrementalService.cpp

diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp
index 757c9de..0e96567 100644
--- a/services/incremental/IncrementalService.cpp
+++ b/services/incremental/IncrementalService.cpp
@@ -91,7 +91,7 @@
     static constexpr auto readLogsMaxInterval = 2h;
 
     // How long should we wait till dataLoader reports destroyed.
-    static constexpr auto destroyTimeout = 60s;
+    static constexpr auto destroyTimeout = 10s;
 
     static constexpr auto anyStatus = INT_MIN;
 };