Clean logging little
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@708341 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
2de525ab33
commit
4c550fb6b9
|
@ -44,6 +44,7 @@ import org.apache.hadoop.hbase.MasterNotRunningException;
|
|||
import org.apache.hadoop.hbase.RemoteExceptionHandler;
|
||||
import org.apache.hadoop.hbase.TableNotFoundException;
|
||||
import org.apache.hadoop.hbase.client.MetaScanner.MetaScannerVisitor;
|
||||
import org.apache.hadoop.hbase.io.BatchUpdate;
|
||||
import org.apache.hadoop.hbase.io.Cell;
|
||||
import org.apache.hadoop.hbase.io.RowResult;
|
||||
import org.apache.hadoop.hbase.ipc.HMasterInterface;
|
||||
|
@ -777,12 +778,10 @@ public class HConnectionManager implements HConstants {
|
|||
if (rootRegionAddress == null) {
|
||||
try {
|
||||
if (LOG.isDebugEnabled()) {
|
||||
LOG.debug("Sleeping. Waiting for root region.");
|
||||
LOG.debug("Sleeping " + getPauseTime(tries) +
|
||||
"ms, waiting for root region.");
|
||||
}
|
||||
Thread.sleep(getPauseTime(tries));
|
||||
if (LOG.isDebugEnabled()) {
|
||||
LOG.debug("Wake. Retry finding root region.");
|
||||
}
|
||||
} catch (InterruptedException iex) {
|
||||
// continue
|
||||
}
|
||||
|
@ -903,6 +902,67 @@ public class HConnectionManager implements HConstants {
|
|||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public void processBatchOfRows(ArrayList<BatchUpdate> list, byte[] tableName)
|
||||
throws IOException {
|
||||
// See HBASE-748 for pseudo code of this method
|
||||
if (list.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
Collections.sort(list);
|
||||
List<BatchUpdate> tempUpdates = new ArrayList<BatchUpdate>();
|
||||
byte[] currentRegion = getRegionLocation(tableName, list.get(0).getRow(),
|
||||
false).getRegionInfo().getRegionName();
|
||||
byte[] region = currentRegion;
|
||||
boolean isLastRow = false;
|
||||
int tries = 0;
|
||||
for (int i = 0; i < list.size() && tries < numRetries; i++) {
|
||||
BatchUpdate batchUpdate = list.get(i);
|
||||
tempUpdates.add(batchUpdate);
|
||||
isLastRow = (i + 1) == list.size();
|
||||
if (!isLastRow) {
|
||||
region = getRegionLocation(tableName, list.get(i + 1).getRow(), false)
|
||||
.getRegionInfo().getRegionName();
|
||||
}
|
||||
if (!Bytes.equals(currentRegion, region) || isLastRow) {
|
||||
final BatchUpdate[] updates = tempUpdates.toArray(new BatchUpdate[0]);
|
||||
int index = getRegionServerForWithoutRetries(new ServerCallable<Integer>(
|
||||
this, tableName, batchUpdate.getRow()) {
|
||||
public Integer call() throws IOException {
|
||||
int i = server.batchUpdates(location.getRegionInfo()
|
||||
.getRegionName(), updates);
|
||||
return i;
|
||||
}
|
||||
});
|
||||
if (index != updates.length - 1) {
|
||||
if (tries == numRetries - 1) {
|
||||
throw new RetriesExhaustedException("Some server",
|
||||
currentRegion, batchUpdate.getRow(),
|
||||
tries, new ArrayList<Throwable>());
|
||||
}
|
||||
if (LOG.isDebugEnabled()) {
|
||||
LOG.debug("reloading table servers because region " +
|
||||
"server didn't accept updates ");
|
||||
}
|
||||
// Basic waiting time. If many updates are flushed, tests have shown
|
||||
// that this is barely needed but when commiting 1 update this may
|
||||
// get retried hundreds of times.
|
||||
try {
|
||||
Thread.sleep(getPauseTime(tries));
|
||||
tries++;
|
||||
} catch (InterruptedException e) {
|
||||
// continue
|
||||
}
|
||||
i = i - updates.length + index;
|
||||
region = getRegionLocation(tableName, list.get(i + 1).getRow(),
|
||||
true).getRegionInfo().getRegionName();
|
||||
|
||||
}
|
||||
currentRegion = region;
|
||||
tempUpdates.clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void close(boolean stopProxy) {
|
||||
if (master != null) {
|
||||
|
@ -921,4 +981,4 @@ public class HConnectionManager implements HConstants {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue