From 21a61ad597bbc1d15cf2aa44fa9307b580f76c38 Mon Sep 17 00:00:00 2001
From: Abhishek Singh Chouhan <achouhan@apache.org>
Date: Fri, 22 Sep 2017 20:20:23 +0530
Subject: [PATCH] HBASE-18796 Addendum: Scanner returning null incorrectly
 during locateRegionInMeta retry, resulting in incorrect
 TableNotFoundException

Signed-off-by: Andrew Purtell <apurtell@apache.org>
---
 .../apache/hadoop/hbase/client/ConnectionImplementation.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
index 036f597dd62..860eef312ca 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
@@ -805,7 +805,7 @@ class ConnectionImplementation implements ClusterConnection, Closeable {
     s.setReversed(true);
     s.withStartRow(metaKey);
     s.addFamily(HConstants.CATALOG_FAMILY);
-    s.setOneRowLimit();
+
     if (this.useMetaReplicas) {
       s.setConsistency(Consistency.TIMELINE);
     }
@@ -835,6 +835,7 @@ class ConnectionImplementation implements ClusterConnection, Closeable {
       try {
         Result regionInfoRow = null;
         s.resetMvccReadPoint();
+        s.setOneRowLimit();
         try (ReversedClientScanner rcs =
             new ReversedClientScanner(conf, s, TableName.META_TABLE_NAME, this, rpcCallerFactory,
                 rpcControllerFactory, getMetaLookupPool(), metaReplicaCallTimeoutScanInMicroSecond)) {