From 69bd0cb8022a724e90f9ca79a8bfe2ca58a34314 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Fri, 12 Feb 2010 19:50:56 +0000
Subject: [PATCH] HBASE-2222 Improve log "Trying to contact region server Some
 server for region , row ip_info_100,,1263329969690, but failed after 11
 attempts.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@909581 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                            |  3 +++
 .../apache/hadoop/hbase/client/HConnectionManager.java | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f23cc293620..51da853947d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -359,6 +359,9 @@ Release 0.21.0 - Unreleased
                (Kay Kay via Stack)
    HBASE-2177  Add timestamping to gc logging option
    HBASE-2066  Perf: parallelize puts
+   HBASE-2222  Improve log "Trying to contact region server Some server for
+               region, row 'ip_info_100,,1263329969690', but failed after
+               11 attempts".
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts
diff --git a/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java b/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
index 2d415ee9ae6..c3db057f3c8 100644
--- a/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
+++ b/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
@@ -49,8 +49,6 @@ import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.MasterNotRunningException;
 import org.apache.hadoop.hbase.RemoteExceptionHandler;
 import org.apache.hadoop.hbase.TableNotFoundException;
-import org.apache.hadoop.hbase.NotServingRegionException;
-import org.apache.hadoop.hbase.regionserver.WrongRegionException;
 import org.apache.hadoop.hbase.client.MetaScanner.MetaScannerVisitor;
 import org.apache.hadoop.hbase.ipc.HBaseRPC;
 import org.apache.hadoop.hbase.ipc.HBaseRPCProtocolVersion;
@@ -1096,8 +1094,8 @@ public class HConnectionManager implements HConstants {
     }
 
     private HRegionLocation
-    getRegionLocationForRowWithRetries(byte[] tableName, byte[] rowKey, 
-      boolean reload)
+      getRegionLocationForRowWithRetries(byte[] tableName, byte[] rowKey,
+        boolean reload)
     throws IOException {
       boolean reloadFlag = reload;
       List<Throwable> exceptions = new ArrayList<Throwable>();
@@ -1121,7 +1119,9 @@ public class HConnectionManager implements HConstants {
         }
       }
       if (location == null) {
-        throw new RetriesExhaustedException("Some server",
+        throw new RetriesExhaustedException(" -- nothing found, no 'location' returned," +
+          " tableName=" + Bytes.toString(tableName) +
+          ", reload=" + reload + " --",
           HConstants.EMPTY_BYTE_ARRAY, rowKey, tries, exceptions);
       }
       return location;