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

HBASE-1101 NPE in HConnectionManager.processBatchOfRows; restore original (and correct) reload behavior 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@731904 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Kyle Purtell 2009-01-06 10:20:22 +00:00
parent 700b2a782d
commit 8e047c5801
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
View File

@ -874,13 +874,12 @@ public class HConnectionManager implements HConstants {
}
private HRegionLocation
getRegionLocationForRowWithRetries(byte[] tableName, byte[] rowKey)
throws IOException {
getRegionLocationForRowWithRetries(byte[] tableName, byte[] rowKey,
boolean reload) throws IOException {
getMaster();
List<Throwable> exceptions = new ArrayList<Throwable>();
HRegionLocation location = null;
int tries = 0;
boolean reload = false;
while (tries < numRetries) {
try {
location = getRegionLocation(tableName, rowKey, reload);
@ -915,7 +914,8 @@ public class HConnectionManager implements HConstants {
Collections.sort(list);
List<BatchUpdate> tempUpdates = new ArrayList<BatchUpdate>();
HRegionLocation location =
getRegionLocationForRowWithRetries(tableName, list.get(0).getRow());
getRegionLocationForRowWithRetries(tableName, list.get(0).getRow(),
false);
byte [] currentRegion = location.getRegionInfo().getRegionName();
byte [] region = currentRegion;
boolean isLastRow = false;
@ -925,7 +925,7 @@ public class HConnectionManager implements HConstants {
isLastRow = (i + 1) == list.size();
if (!isLastRow) {
location = getRegionLocationForRowWithRetries(tableName,
list.get(i+1).getRow());
list.get(i+1).getRow(), false);
region = location.getRegionInfo().getRegionName();
}
if (!Bytes.equals(currentRegion, region) || isLastRow || retryOnlyOne) {
@ -960,7 +960,7 @@ public class HConnectionManager implements HConstants {
i = i - updates.length + index;
retryOnlyOne = true;
location = getRegionLocationForRowWithRetries(tableName,
list.get(i + 1).getRow());
list.get(i + 1).getRow(), true);
region = location.getRegionInfo().getRegionName();
}
else {