Do not hide BulkTransferException messages when there were more than one exception

thii · copybara-github · commit 113eaca5862c · 2022-03-07T05:37:46.000-08:00
Previously, when there were more than one BulkTransferException, it would be reported like this: ``` Executing genrule //:foo failed: Exec failed due to IOException: 221 errors during bulk transfer ``` which didn't include the underlying exception messages. The only case that underlying exceptions were included was when there was only one exception. This change patches the error message to include all the exception messages, which helps diagnose BulkTransferException. Closes bazelbuild#14981. PiperOrigin-RevId: 432921283
diff --git a/src/main/java/com/google/devtools/build/lib/remote/common/BulkTransferException.java b/src/main/java/com/google/devtools/build/lib/remote/common/BulkTransferException.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.remote.common;
 
+import com.google.common.base.Joiner;
 import java.io.IOException;
 
 /**
@@ -57,6 +58,9 @@ public String getMessage() {
     if (super.getSuppressed().length == 1) {
       return super.getSuppressed()[0].getMessage();
     }
-    return String.format("%d errors during bulk transfer", super.getSuppressed().length);
+    String errorSummary =
+        String.format("%d errors during bulk transfer:", super.getSuppressed().length);
+    String combinedSuberrors = Joiner.on('\n').join(super.getSuppressed());
+    return Joiner.on('\n').join(errorSummary, combinedSuberrors);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`// limitations under the License.`
`14`	`14`	`package com.google.devtools.build.lib.remote.common;`
`15`	`15`
	`16`	`+import com.google.common.base.Joiner;`
`16`	`17`	`import java.io.IOException;`
`17`	`18`
`18`	`19`	`/**`
`@@ -57,6 +58,9 @@ public String getMessage() {`
`57`	`58`	`if (super.getSuppressed().length == 1) {`
`58`	`59`	`return super.getSuppressed()[0].getMessage();`
`59`	`60`	`}`
`60`		`- return String.format("%d errors during bulk transfer", super.getSuppressed().length);`
	`61`	`+ String errorSummary =`
	`62`	`+ String.format("%d errors during bulk transfer:", super.getSuppressed().length);`
	`63`	`+ String combinedSuberrors = Joiner.on('\n').join(super.getSuppressed());`
	`64`	`+ return Joiner.on('\n').join(errorSummary, combinedSuberrors);`
`61`	`65`	`}`
`62`	`66`	`}`