You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2014/09/03 03:29:25 UTC
[2/3] git commit: HBASE-11876 RegionScanner.nextRaw should not update
metrics
HBASE-11876 RegionScanner.nextRaw should not update metrics
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fc27fb02
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fc27fb02
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fc27fb02
Branch: refs/heads/branch-1
Commit: fc27fb0241aa165fd68bd73f57cfd3d4387b9f68
Parents: 4b2f43f
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Sep 2 18:28:57 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Sep 2 18:28:57 2014 -0700
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/HRegion.java | 10 -------
.../hbase/regionserver/RSRpcServices.java | 29 ++++++++++++--------
.../hbase/regionserver/RegionScanner.java | 1 +
3 files changed, 19 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/fc27fb02/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 6acfa20..333c718 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -4024,19 +4024,9 @@ public class HRegion implements HeapSize { // , Writable{
if (isFilterDoneInternal()) {
returnResult = false;
}
- if (region != null && region.metricsRegion != null) {
- long totalSize = 0;
- for(Cell c:outResults) {
- // TODO clean up
- KeyValue kv = KeyValueUtil.ensureKeyValue(c);
- totalSize += kv.getLength();
- }
- region.metricsRegion.updateScanNext(totalSize);
- }
return returnResult;
}
-
private void populateFromJoinedHeap(List<Cell> results, int limit)
throws IOException {
assert joinedContinuationRow != null;
http://git-wip-us.apache.org/repos/asf/hbase/blob/fc27fb02/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
index 01033a9..7d25bcd 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
@@ -49,6 +49,7 @@ import org.apache.hadoop.hbase.HBaseIOException;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.KeyValueUtil;
import org.apache.hadoop.hbase.NotServingRegionException;
import org.apache.hadoop.hbase.ServerName;
@@ -1962,6 +1963,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
lease = regionServer.leases.removeLease(scannerName);
List<Result> results = new ArrayList<Result>(rows);
long currentScanResultSize = 0;
+ long totalKvSize = 0;
boolean done = false;
// Call coprocessor. Get region info from scanner.
@@ -1970,10 +1972,10 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
scanner, results, rows);
if (!results.isEmpty()) {
for (Result r : results) {
- if (maxScannerResultSize < Long.MAX_VALUE){
- for (Cell kv : r.rawCells()) {
- currentScanResultSize += KeyValueUtil.ensureKeyValue(kv).heapSize();
- }
+ for (Cell cell : r.rawCells()) {
+ KeyValue kv = KeyValueUtil.ensureKeyValue(cell);
+ currentScanResultSize += kv.heapSize();
+ totalKvSize += kv.getLength();
}
}
}
@@ -1993,15 +1995,19 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
int i = 0;
synchronized(scanner) {
boolean stale = (region.getRegionInfo().getReplicaId() != 0);
- for (; i < rows
- && currentScanResultSize < maxResultSize; ) {
+ while (i < rows) {
+ // Stop collecting results if maxScannerResultSize is set and we have exceeded it
+ if ((maxScannerResultSize < Long.MAX_VALUE) &&
+ (currentScanResultSize >= maxResultSize)) {
+ break;
+ }
// Collect values to be returned here
boolean moreRows = scanner.nextRaw(values);
if (!values.isEmpty()) {
- if (maxScannerResultSize < Long.MAX_VALUE){
- for (Cell kv : values) {
- currentScanResultSize += KeyValueUtil.ensureKeyValue(kv).heapSize();
- }
+ for (Cell cell : values) {
+ KeyValue kv = KeyValueUtil.ensureKeyValue(cell);
+ currentScanResultSize += kv.heapSize();
+ totalKvSize += kv.getLength();
}
results.add(Result.create(values, null, stale));
i++;
@@ -2013,6 +2019,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
}
}
region.readRequestsCount.add(i);
+ region.getMetrics().updateScanNext(totalKvSize);
} finally {
region.closeRegionOperation();
}
@@ -2032,7 +2039,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
} else {
addResults(builder, results, controller, RegionReplicaUtil.isDefaultReplica(region.getRegionInfo()));
}
- } finally {
+ } finally {
// We're done. On way out re-add the above removed lease.
// Adding resets expiration time on lease.
if (scanners.containsKey(scannerName)) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/fc27fb02/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScanner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScanner.java
index 07cbc4c..f75b9a2 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScanner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScanner.java
@@ -69,6 +69,7 @@ public interface RegionScanner extends InternalScanner {
* to return.
* This is a special internal method to be called from coprocessor hooks to avoid expensive setup.
* Caller must set the thread's readpoint, start and close a region operation, an synchronize on the scanner object.
+ * Caller should maintain and update metrics.
* See {@link #nextRaw(List, int)}
* @param result return output array
* @return true if more rows exist after this one, false if scanner is done