Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-9796 npe in RegionServerCallable 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1533296 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-10-18 00:09:05 +00:00
parent 25c871b71c
commit c476b4bd87
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java
View File

@ -117,7 +117,7 @@ public abstract class RegionServerCallable<T> implements RetryingCallable<T> {
// if thrown these exceptions, we clear all the cache entries that
// map to that slow/dead server; otherwise, let cache miss and ask
// hbase:meta again to find the new location
getConnection().clearCaches(location.getServerName());
if (this.location != null) getConnection().clearCaches(location.getServerName());
} else if (t instanceof RegionMovedException) {
getConnection().updateCachedLocations(tableName, row, t, location);
} else if (t instanceof NotServingRegionException && !retrying) {
@ -136,7 +136,7 @@ public abstract class RegionServerCallable<T> implements RetryingCallable<T> {
public long sleep(long pause, int tries) {
// Tries hasn't been bumped up yet so we use "tries + 1" to get right pause time
long sleep = ConnectionUtils.getPauseTime(pause, tries + 1);
if (sleep < MIN_WAIT_DEAD_SERVER
if (sleep < MIN_WAIT_DEAD_SERVER
&& (location == null || getConnection().isDeadServer(location.getServerName()))) {
sleep = ConnectionUtils.addJitter(MIN_WAIT_DEAD_SERVER, 0.10f);
}
@ -152,4 +152,4 @@ public abstract class RegionServerCallable<T> implements RetryingCallable<T> {
}
return this.location.getRegionInfo();
}
}
}