Add a retry in the case of exit code 224; Seeks to address dotnet#354

If this is insufficient there are some helix-based extra things to try.
MattGal · Nov 14, 2020 · 8fa53fb · 8fa53fb
1 parent 9769171
commit 8fa53fb
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/Microsoft.DotNet.XHarness.Android/AdbExitCodes.cs b/src/Microsoft.DotNet.XHarness.Android/AdbExitCodes.cs
@@ -12,6 +12,7 @@ public enum AdbExitCodes
         SUCCESS = 0,
         INSTRUMENTATION_SUCCESS = -1,
         INSTRUMENTATION_TIMEOUT = -2,
+        ADB_BROKEN_PIPE = 224,
         ADB_UNINSTALL_APP_NOT_ON_DEVICE = 255,
         ADB_UNINSTALL_APP_NOT_ON_EMULATOR = 1,
     }

diff --git a/src/Microsoft.DotNet.XHarness.Android/AdbRunner.cs b/src/Microsoft.DotNet.XHarness.Android/AdbRunner.cs
@@ -174,6 +174,17 @@ public int InstallApk(string apkPath)
                 throw new FileNotFoundException($"Could not find {apkPath}");
             }
             var result = RunAdbCommand($"install \"{apkPath}\"");
+
+            // If this keeps happening, we should look into exercising Helix infra retry logic when on Helix
+            // since users should be able assume tests themselves can't break the ADB server.
+            if (result.ExitCode == (int)AdbExitCodes.ADB_BROKEN_PIPE)
+            {
+                _log.LogInformation($"Hit broken pipe error; Will make one attempt to restart ADB server, and retry the install");
+                KillAdbServer();
+                StartAdbServer();
+                result = RunAdbCommand($"install \"{apkPath}\"");
+            }
+
             if (result.ExitCode != 0)
             {
                 _log.LogError($"Error:{Environment.NewLine}{result}");
@@ -194,6 +205,16 @@ public int UninstallApk(string apkName)
 
             _log.LogInformation($"Attempting to remove apk '{apkName}': ");
             var result = RunAdbCommand($"uninstall {apkName}");
+
+            // See note above in install()
+            if (result.ExitCode == (int)AdbExitCodes.ADB_BROKEN_PIPE)
+            {
+                _log.LogInformation($"Hit broken pipe error; Will make one attempt to restart ADB server, and retry the uninstallation");
+                KillAdbServer();
+                StartAdbServer();
+                result = RunAdbCommand($"uninstall {apkName}");
+            }
+
             if (result.ExitCode == (int)AdbExitCodes.SUCCESS)
             {
                 _log.LogInformation($"Successfully uninstalled {apkName}.");