diff options
| author | 2024-09-23 12:10:09 +0000 | |
|---|---|---|
| committer | 2024-09-23 12:20:11 +0000 | |
| commit | 5aa8d157afa3e15419a41bf0da0500d6ba01596b (patch) | |
| tree | 4ff47fa785fea13ba643cc9ad81b3a0df6605ef6 | |
| parent | 5c7cd859d61f34689cf85a88e5ded7bead3634cf (diff) | |
dumpstate.cpp: increase perfetto serialization timeout
This commit increases the timeout of "perfetto --save-for-bugreport"
from 10s to 30s, thus giving more time to data sources to process
OnFlush.
30s seems a bit extreme but in production we ran into cases
(e.g. b/369053554), where the serialization took >18s.
Fix: 369053554
Flag: EXEMPT bugfix
Test: atest com.android.os.bugreports.tests.BugreportManagerTest
Ignore-AOSP-First: depends on changes not available in AOSP
(I343813929a537c601132dd15db5e2c4d3fbbdcb1)
Change-Id: Ie976c7d86fef854f24b115b347890a3d40be9885
| -rw-r--r-- | cmds/dumpstate/dumpstate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp index 220fef6f8d..2383732234 100644 --- a/cmds/dumpstate/dumpstate.cpp +++ b/cmds/dumpstate/dumpstate.cpp @@ -3533,7 +3533,7 @@ std::future<std::string> Dumpstate::MaybeSnapshotSystemTraceAsync() { // the dumpstate's own activity which is irrelevant. RunCommand( SERIALIZE_PERFETTO_TRACE_TASK, {"perfetto", "--save-for-bugreport"}, - CommandOptions::WithTimeout(10).DropRoot().CloseAllFileDescriptorsOnExec().Build(), + CommandOptions::WithTimeout(30).DropRoot().CloseAllFileDescriptorsOnExec().Build(), false, outFd); // MaybeAddSystemTraceToZip() will take care of copying the trace in the zip // file in the later stages. |