continue run when meet exception during commit secondary key (#1553)

pingcap · Aug 12, 2020 · 841adf7 · 841adf7
1 parent 73817ba
commit 841adf7
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/tikv-client/src/main/java/com/pingcap/tikv/TwoPhaseCommitter.java b/tikv-client/src/main/java/com/pingcap/tikv/TwoPhaseCommitter.java
@@ -509,6 +509,7 @@ public ByteString next() {
   private void doCommitSecondaryKeys(
       Iterator<ByteString> keys, long commitTs, int commitBackOfferMS)
       throws TiBatchWriteException {
+    TiBatchWriteException lastException = null;
     try {
       int taskBufferSize = writeThreadPerTask * 2;
       int totalSize = 0, cnt = 0;
@@ -545,7 +546,12 @@ private void doCommitSecondaryKeys(
       Thread.currentThread().interrupt();
       throw new TiBatchWriteException("Current thread interrupted.", e);
     } catch (ExecutionException e) {
-      throw new TiBatchWriteException("Execution exception met.", e);
+      lastException = new TiBatchWriteException("Execution exception met.", e);
+      LOG.warn("Execution exception met.", e);
+    }
+
+    if (lastException != null) {
+      throw lastException;
     }
   }