commit 51ccc52e1c8d4c1933962887f17b941e2b757428
author Julien Desprez <jdesprez@google.com> Thu May 21 22:40:09 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 21 22:40:09 2020 +0000
tree 4aa542d3459fa5c4d18b762795a7ab5fc03a25d7
parent f2179ac21c4c420e6f932af14c4c3e1a4768fd81
parent f7d6e872d62bb66ecc400bb6f588b4cae3ff5305

Merge "Disable compression of logs in subprocess in sandbox"

src/com/android/tradefed/result/FileSystemLogSaver.java

diff --git a/src/com/android/tradefed/result/FileSystemLogSaver.java b/src/com/android/tradefed/result/FileSystemLogSaver.java
index f8ba5f0..7a346ba 100644
--- a/src/com/android/tradefed/result/FileSystemLogSaver.java
+++ b/src/com/android/tradefed/result/FileSystemLogSaver.java
@@ -342,4 +342,8 @@
     void setLogRetentionDays(int logRetentionDays) {
         mLogRetentionDays = logRetentionDays;
     }
+
+    public void setCompressFiles(boolean compress) {
+        mCompressFiles = compress;
+    }
 }

src/com/android/tradefed/sandbox/SandboxConfigDump.java

diff --git a/src/com/android/tradefed/sandbox/SandboxConfigDump.java b/src/com/android/tradefed/sandbox/SandboxConfigDump.java
index 2395bbb..0031623 100644
--- a/src/com/android/tradefed/sandbox/SandboxConfigDump.java
+++ b/src/com/android/tradefed/sandbox/SandboxConfigDump.java
@@ -25,6 +25,8 @@
 import com.android.tradefed.device.IDeviceSelection;
 import com.android.tradefed.log.FileLogger;
 import com.android.tradefed.log.ILeveledLogOutput;
+import com.android.tradefed.result.FileSystemLogSaver;
+import com.android.tradefed.result.ILogSaver;
 import com.android.tradefed.result.ITestInvocationListener;
 import com.android.tradefed.result.SubprocessResultsReporter;
 import com.android.tradefed.result.proto.StreamProtoResultReporter;
@@ -107,6 +109,12 @@
                     ((FileLogger) logger).setLogLevelDisplay(LogLevel.VERBOSE);
                 }
 
+                ILogSaver logSaver = config.getLogSaver();
+                if (logSaver instanceof FileSystemLogSaver) {
+                    // Send the files directly, the parent will take care of compression if needed
+                    ((FileSystemLogSaver) logSaver).setCompressFiles(false);
+                }
+
                 // Ensure in special conditions (placeholder devices) we can still allocate.
                 secureDeviceAllocation(config);