core: clarify exception message

github-brice-jaglin · ejona86 · commit 62fafe7edae5 · 2021-09-02T15:18:00.000-07:00
Reformulate message to highlight that SizeEnforcingInputStream is
applied on the message size of the message after decompression.
diff --git a/core/src/main/java/io/grpc/internal/MessageDeframer.java b/core/src/main/java/io/grpc/internal/MessageDeframer.java
@@ -517,8 +517,8 @@ private void reportCount() {
     private void verifySize() {
       if (count > maxMessageSize) {
         throw Status.RESOURCE_EXHAUSTED.withDescription(String.format(
-                "Compressed gRPC message exceeds maximum size %d: %d bytes read",
-                maxMessageSize, count)).asRuntimeException();
+                "Decompressed gRPC message exceeds maximum size %d",
+                maxMessageSize)).asRuntimeException();
       }
     }
   }
diff --git a/core/src/test/java/io/grpc/internal/MessageDeframerTest.java b/core/src/test/java/io/grpc/internal/MessageDeframerTest.java
@@ -378,7 +378,7 @@ public void sizeEnforcingInputStream_readByteAboveLimit() throws IOException {
 
       try {
         thrown.expect(StatusRuntimeException.class);
-        thrown.expectMessage("RESOURCE_EXHAUSTED: Compressed gRPC message exceeds");
+        thrown.expectMessage("RESOURCE_EXHAUSTED: Decompressed gRPC message exceeds");
 
         while (stream.read() != -1) {
         }
@@ -424,7 +424,7 @@ public void sizeEnforcingInputStream_readAboveLimit() throws IOException {
 
       try {
         thrown.expect(StatusRuntimeException.class);
-        thrown.expectMessage("RESOURCE_EXHAUSTED: Compressed gRPC message exceeds");
+        thrown.expectMessage("RESOURCE_EXHAUSTED: Decompressed gRPC message exceeds");
 
         stream.read(buf, 0, buf.length);
       } finally {
@@ -467,7 +467,7 @@ public void sizeEnforcingInputStream_skipAboveLimit() throws IOException {
 
       try {
         thrown.expect(StatusRuntimeException.class);
-        thrown.expectMessage("RESOURCE_EXHAUSTED: Compressed gRPC message exceeds");
+        thrown.expectMessage("RESOURCE_EXHAUSTED: Decompressed gRPC message exceeds");
 
         stream.skip(4);
       } finally {

Original file line number	Diff line number	Diff line change
`@@ -517,8 +517,8 @@ private void reportCount() {`
`517`	`517`	`private void verifySize() {`
`518`	`518`	`if (count > maxMessageSize) {`
`519`	`519`	`throw Status.RESOURCE_EXHAUSTED.withDescription(String.format(`
`520`		`- "Compressed gRPC message exceeds maximum size %d: %d bytes read",`
`521`		`- maxMessageSize, count)).asRuntimeException();`
	`520`	`+ "Decompressed gRPC message exceeds maximum size %d",`
	`521`	`+ maxMessageSize)).asRuntimeException();`
`522`	`522`	`}`
`523`	`523`	`}`
`524`	`524`	`}`