You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2016/06/25 09:45:30 UTC
hbase git commit: Revert "Is this ok... removing synchronizations?"
REVERT MISTAKEN COMMIT
Repository: hbase
Updated Branches:
refs/heads/branch-1 cf65772a3 -> 8ef87ce43
Revert "Is this ok... removing synchronizations?"
REVERT MISTAKEN COMMIT
This reverts commit 86242e1f55da7df6a2119389897d11356e6bbc2a.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8ef87ce4
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8ef87ce4
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8ef87ce4
Branch: refs/heads/branch-1
Commit: 8ef87ce4343e80321fcfd99594372759557c90f2
Parents: cf65772
Author: stack <st...@apache.org>
Authored: Sat Jun 25 10:45:10 2016 +0100
Committer: stack <st...@apache.org>
Committed: Sat Jun 25 10:45:10 2016 +0100
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/HRegion.java | 24 +++++++++-----------
.../regionserver/ReversedRegionScannerImpl.java | 2 +-
2 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/8ef87ce4/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 f856fb8..c497ec0 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
@@ -325,10 +325,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
static final long DEFAULT_ROW_PROCESSOR_TIMEOUT = 60 * 1000L;
final ExecutorService rowProcessorExecutor = Executors.newCachedThreadPool();
- // Map of outstanding region scanners to their mvcc read point. Used figuring what is oldest
- // outstanding read point
- private final Map<RegionScanner, Long> scannerReadPoints =
- new ConcurrentHashMap<RegionScanner, Long>();
+ private final ConcurrentHashMap<RegionScanner, Long> scannerReadPoints;
/**
* The sequence ID that was encountered when this region was opened.
@@ -686,6 +683,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
this.rsServices = rsServices;
this.threadWakeFrequency = conf.getLong(HConstants.THREAD_WAKE_FREQUENCY, 10 * 1000);
setHTableSpecificConf();
+ this.scannerReadPoints = new ConcurrentHashMap<RegionScanner, Long>();
this.busyWaitDuration = conf.getLong(
"hbase.busy.wait.duration", DEFAULT_BUSY_WAIT_DURATION);
@@ -5634,9 +5632,9 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
* If the joined heap data gathering is interrupted due to scan limits, this will
* contain the row for which we are populating the values.*/
protected Cell joinedContinuationRow = null;
- private volatile boolean closed = false;
+ private boolean filterClosed = false;
- protected final int scan;
+ protected final int isScan;
protected final byte[] stopRow;
protected final HRegion region;
@@ -5674,7 +5672,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
}
// If we are doing a get, we want to be [startRow,endRow] normally
// it is [startRow,endRow) and if startRow=endRow we get nothing.
- this.scan = scan.isGetScan() ? -1 : 0;
+ this.isScan = scan.isGetScan() ? -1 : 0;
// synchronize on scannerReadPoints so that nobody calculates
// getSmallestReadPoint, before scannerReadPoints is updated.
@@ -5783,9 +5781,9 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
}
@Override
- public boolean next(List<Cell> outResults, ScannerContext scannerContext)
+ public synchronized boolean next(List<Cell> outResults, ScannerContext scannerContext)
throws IOException {
- if (this.closed) {
+ if (this.filterClosed) {
throw new UnknownScannerException("Scanner was closed (timed out?) " +
"after we renewed it. Could be caused by a very slow scanner " +
"or a lengthy garbage collection");
@@ -6219,12 +6217,11 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
return currentRow == null ||
(stopRow != null &&
comparator.compareRows(stopRow, 0, stopRow.length,
- currentRow, offset, length) <= scan);
+ currentRow, offset, length) <= isScan);
}
@Override
- public void close() {
- this.closed = true;
+ public synchronized void close() {
if (storeHeap != null) {
storeHeap.close();
storeHeap = null;
@@ -6233,10 +6230,11 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
joinedHeap.close();
joinedHeap = null;
}
+ // no need to synchronize here.
scannerReadPoints.remove(this);
+ this.filterClosed = true;
}
- @VisibleForTesting
KeyValueHeap getStoreHeapForTesting() {
return storeHeap;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/8ef87ce4/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java
index 77aaf37..63c1ca6 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java
@@ -59,7 +59,7 @@ class ReversedRegionScannerImpl extends RegionScannerImpl {
protected boolean isStopRow(byte[] currentRow, int offset, short length) {
return currentRow == null
|| (super.stopRow != null && region.getComparator().compareRows(
- stopRow, 0, stopRow.length, currentRow, offset, length) >= super.scan);
+ stopRow, 0, stopRow.length, currentRow, offset, length) >= super.isScan);
}
@Override