From 591815b889d295ab12862c833d59e22895812257 Mon Sep 17 00:00:00 2001
From: Liangliang Gu <marsishandsome@gmail.com>
Date: Wed, 8 Sep 2021 19:52:16 +0800
Subject: [PATCH] Ingest: fix split batch bug & Increase ingest timeout (#272)

Signed-off-by: marsishandsome <marsishandsome@gmail.com>
---
 src/main/java/org/tikv/common/importer/ImporterClient.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/tikv/common/importer/ImporterClient.java b/src/main/java/org/tikv/common/importer/ImporterClient.java
index d2822a3dac..12032a311d 100644
--- a/src/main/java/org/tikv/common/importer/ImporterClient.java
+++ b/src/main/java/org/tikv/common/importer/ImporterClient.java
@@ -78,7 +78,7 @@ public class ImporterClient {
           pairs.add(ImportSstpb.Pair.newBuilder().setKey(pair.first).setValue(pair.second).build());
           totalBytes += (pair.first.size() + pair.second.size());
         }
-        if (totalBytes > maxKVBatchBytes) {
+        if (totalBytes > maxKVBatchBytes || !iterator.hasNext()) {
           break;
         }
       }
@@ -89,6 +89,7 @@ public class ImporterClient {
         streamOpened = true;
       }
       writeBatch(pairs);
+      totalBytes = 0;
     }
 
     if (streamOpened) {