Merge a04598a into 94c7848

yirutang · web-flow · commit d1c2ecff08e2 · 2021-02-16T19:22:32.000Z
diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriter.java
@@ -932,6 +932,7 @@ public void onComplete() {
     public void onError(Throwable t) {
       LOG.fine("OnError called");
       if (streamWriter.shutdown.get()) {
+        abortInflightRequests(t);
         return;
       }
       InflightBatch inflightBatch = null;
diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterTest.java
@@ -1015,4 +1015,38 @@ public void testDatasetTraceId() throws Exception {
     assertEquals("Dataflow", testBigQueryWrite.getAppendRequests().get(0).getTraceId());
     assertEquals("", testBigQueryWrite.getAppendRequests().get(1).getTraceId());
   }
+
+  @Test
+  public void testShutdownWithConnectionError() throws Exception {
+    StreamWriter writer =
+        getTestStreamWriterBuilder()
+            .setBatchingSettings(
+                StreamWriter.Builder.DEFAULT_BATCHING_SETTINGS
+                    .toBuilder()
+                    .setElementCountThreshold(1L)
+                    .build())
+            .build();
+    testBigQueryWrite.addResponse(
+        AppendRowsResponse.newBuilder()
+            .setAppendResult(
+                AppendRowsResponse.AppendResult.newBuilder().setOffset(Int64Value.of(1)).build())
+            .build());
+    testBigQueryWrite.addException(Status.DATA_LOSS.asException());
+    testBigQueryWrite.setResponseDelay(Duration.ofSeconds(10));
+
+    ApiFuture<AppendRowsResponse> appendFuture1 = sendTestMessage(writer, new String[] {"A"});
+    ApiFuture<AppendRowsResponse> appendFuture2 = sendTestMessage(writer, new String[] {"B"});
+    Thread.sleep(5000L);
+    // Move the needle for responses to be sent.
+    fakeExecutor.advanceTime(Duration.ofSeconds(20));
+    // Shutdown writer immediately and there will be some error happened when flushing the queue.
+    writer.shutdown();
+    assertEquals(1, appendFuture1.get().getAppendResult().getOffset().getValue());
+    try {
+      appendFuture2.get();
+      fail("Should fail with exception");
+    } catch (java.util.concurrent.ExecutionException e) {
+      assertEquals("Request aborted due to previous failures", e.getCause().getMessage());
+    }
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -932,6 +932,7 @@ public void onComplete() {`
`932`	`932`	`public void onError(Throwable t) {`
`933`	`933`	`LOG.fine("OnError called");`
`934`	`934`	`if (streamWriter.shutdown.get()) {`
	`935`	`+ abortInflightRequests(t);`
`935`	`936`	`return;`
`936`	`937`	`}`
`937`	`938`	`InflightBatch inflightBatch = null;`