From 8adf6857c7a4ee6b7cb1ebe9dd53af56fe7f61e8 Mon Sep 17 00:00:00 2001
From: Yu Li <liyu@apache.org>
Date: Thu, 1 Dec 2016 01:13:18 +0800
Subject: [PATCH] HBASE-17211 Add more details in log when
 UnknownScannerException thrown in ScannerCallable

---
 .../java/org/apache/hadoop/hbase/client/ScannerCallable.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java
index 7a22648ff0b..642fae0a2a1 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java
@@ -359,7 +359,10 @@ public class ScannerCallable extends ClientServiceCallable<Result[]> {
         throw ProtobufUtil.handleRemoteException(e);
       }
     } catch (IOException e) {
-      LOG.warn("Ignore, probably already closed", e);
+      TableName table = getTableName();
+      String tableDetails = (table == null) ? "" : (" on table: " + table.getNameAsString());
+      LOG.warn("Ignore, probably already closed. Current scan: " + getScan().toString()
+          + tableDetails, e);
     }
     this.scannerId = -1L;
   }