Index: src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 1000212) +++ src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -986,7 +986,7 @@ this.replicationHandler = Replication.isReplication(this.conf)? new Replication(this, this.fs, logdir, oldLogDir): null; } catch (KeeperException e) { - throw new IOException("Failed replication handler create", e); + throw new IOException("Failed replication handler create on " + this.serverInfo.getServerName(), e); } return instantiateHLog(logdir, oldLogDir); } @@ -1495,7 +1495,7 @@ public void put(final byte[] regionName, final Put put) throws IOException { if (put.getRow() == null) { - throw new IllegalArgumentException("update has null row"); + throw new IllegalArgumentException("update has null row on " + this.serverInfo.getServerName()); } checkOpen(); @@ -1645,7 +1645,8 @@ String scannerName = String.valueOf(scannerId); InternalScanner s = this.scanners.get(scannerName); if (s == null) { - throw new UnknownScannerException("Name: " + scannerName); + throw new UnknownScannerException("Name: " + scannerName + " on " + + this.serverInfo.getServerName()); } try { checkOpen(); @@ -1860,7 +1861,7 @@ String lockName = String.valueOf(lockId); Integer r = rowlocks.remove(lockName); if (r == null) { - throw new UnknownRowLockException(lockName); + throw new UnknownRowLockException(lockName + " on " + this.serverInfo.getServerName()); } region.releaseRowLock(r); this.leases.cancelLease(lockName); @@ -1926,7 +1927,8 @@ if (!onlineRegions.containsKey(region.getEncodedName())) { LOG.warn("Received close for region we are not serving"); throw new NotServingRegionException("Received close for " - + region.getRegionNameAsString() + " but we are not serving it"); + + region.getRegionNameAsString() + " but " + this.serverInfo.getServerName() + + " is not serving it"); } return closeRegion(region, false, true); } @@ -2118,7 +2120,7 @@ region = getOnlineRegion(regionName); if (region == null) { throw new NotServingRegionException("Region is not online: " + - Bytes.toStringBinary(regionName)); + Bytes.toStringBinary(regionName) + " on " + this.serverInfo.getServerName()); } return region; } finally { @@ -2156,11 +2158,11 @@ */ protected void checkOpen() throws IOException { if (this.stopped || this.abortRequested) { - throw new IOException("Server not running" + throw new IOException("Server not running on " + this.serverInfo.getServerName() + (this.abortRequested ? ", aborting" : "")); } if (!fsOk) { - throw new IOException("File system not available"); + throw new IOException("File system not available on " + this.serverInfo.getServerName()); } } @@ -2419,7 +2421,7 @@ .getConstructor(Configuration.class); return c.newInstance(conf2); } catch (Exception e) { - throw new RuntimeException("Failed construction of " + "Master: " + throw new RuntimeException("Failed construction of region server: " + regionServerClass.toString(), e); } }