From 6180e560eb9e3abf41970b70df7b20f741e1b851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9E=84=ED=98=95=EC=84=9D=5BIndexing=201=5D?=
 <hyungseok.lim@navercorp.com>
Date: Mon, 14 Mar 2022 11:42:40 +0900
Subject: [PATCH] HBASE-26630 When using SingleColumnValueFilter in
 TableSnapshotInputFormat, there was a problem that the job was terminated in
 the middle

---
 .../hadoop/hbase/client/ClientSideRegionScanner.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java
index 1feafc18993f..0e525d246a2a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java
@@ -93,9 +93,12 @@ public ClientSideRegionScanner(Configuration conf, FileSystem fs,
   @Override
   public Result next() throws IOException {
     values.clear();
-    scanner.nextRaw(values);
-    if (values.isEmpty()) {
-      //we are done
+    boolean moreValues;
+    do {
+      moreValues = scanner.nextRaw(values);
+    } while (values.isEmpty() && moreValues);
+
+    if (!moreValues) {
       return null;
     }