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 2009/07/17 06:27:12 UTC
svn commit: r794956 - in /hadoop/hbase/trunk: CHANGES.txt
src/java/org/apache/hadoop/hbase/UnknownScannerException.java
src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: stack
Date: Fri Jul 17 04:27:11 2009
New Revision: 794956
URL: http://svn.apache.org/viewvc?rev=794956&view=rev
Log:
HBASE-1609 We wait on leases to expire before regionserver goes down. Rather, just let client fail
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/UnknownScannerException.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=794956&r1=794955&r2=794956&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Jul 17 04:27:11 2009
@@ -491,6 +491,8 @@
HBASE-1662 Tool to run major compaction on catalog regions when hbase is
shutdown
HBASE-1665 expose more load information to the client side
+ HBASE-1609 We wait on leases to expire before regionserver goes down.
+ Rather, just let client fail
OPTIMIZATIONS
HBASE-1412 Change values for delete column and column family in KeyValue
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/UnknownScannerException.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/UnknownScannerException.java?rev=794956&r1=794955&r2=794956&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/UnknownScannerException.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/UnknownScannerException.java Fri Jul 17 04:27:11 2009
@@ -21,7 +21,10 @@
/**
- * Thrown if a region server is passed an unknown scanner id
+ * Thrown if a region server is passed an unknown scanner id.
+ * Usually means the client has take too long between checkins and so the
+ * scanner lease on the serverside has expired OR the serverside is closing
+ * down and has cancelled all leases.
*/
public class UnknownScannerException extends DoNotRetryIOException {
private static final long serialVersionUID = 993179627856392526L;
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=794956&r1=794955&r2=794956&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java Fri Jul 17 04:27:11 2009
@@ -30,7 +30,6 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -198,7 +197,6 @@
new ReentrantReadWriteLock();
private final Object splitLock = new Object();
private long minSequenceId;
- final AtomicInteger activeScannerCount = new AtomicInteger(0);
/**
* Name of the region info file that resides just under the region directory.
@@ -466,19 +464,6 @@
}
newScannerLock.writeLock().lock();
try {
- // Wait for active scanners to finish. The write lock we hold will
- // prevent new scanners from being created.
- synchronized (activeScannerCount) {
- while (activeScannerCount.get() != 0) {
- LOG.debug("waiting for " + activeScannerCount.get() +
- " scanners to finish");
- try {
- activeScannerCount.wait();
- } catch (InterruptedException e) {
- // continue
- }
- }
- }
splitsAndClosesLock.writeLock().lock();
LOG.debug("Updates disabled for region, no outstanding scanners on " +
this);
@@ -1690,8 +1675,8 @@
* It is used to combine scanners from multiple Stores (aka column families).
*/
class RegionScanner implements InternalScanner {
- private KeyValueHeap storeHeap;
- private byte [] stopRow;
+ private final KeyValueHeap storeHeap;
+ private final byte [] stopRow;
RegionScanner(Scan scan) {
if (Bytes.equals(scan.getStopRow(), HConstants.EMPTY_END_ROW)) {
@@ -1708,10 +1693,6 @@
}
this.storeHeap =
new KeyValueHeap(scanners.toArray(new KeyValueScanner[0]), comparator);
-
- // As we have now successfully completed initialization, increment the
- // activeScanner count.
- activeScannerCount.incrementAndGet();
}
/**
@@ -1763,23 +1744,9 @@
}
public void close() {
- try {
- storeHeap.close();
- } finally {
- synchronized (activeScannerCount) {
- int count = activeScannerCount.decrementAndGet();
- if (count < 0) {
- LOG.error("active scanner count less than zero: " + count +
- " resetting to zero");
- activeScannerCount.set(0);
- count = 0;
- }
- if (count == 0) {
- activeScannerCount.notifyAll();
- }
- }
- }
+ storeHeap.close();
}
+
/**
*
* @param scanner to be closed
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=794956&r1=794955&r2=794956&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Fri Jul 17 04:27:11 2009
@@ -1623,7 +1623,16 @@
} finally {
this.lock.writeLock().unlock();
}
- for(HRegion region: regionsToClose) {
+ // Close any outstanding scanners. Means they'll get an UnknownScanner
+ // exception next time they come in.
+ for (Map.Entry<String, InternalScanner> e: this.scanners.entrySet()) {
+ try {
+ e.getValue().close();
+ } catch (IOException ioe) {
+ LOG.warn("Closing scanner " + e.getKey(), ioe);
+ }
+ }
+ for (HRegion region: regionsToClose) {
if (LOG.isDebugEnabled()) {
LOG.debug("closing region " + Bytes.toString(region.getRegionName()));
}
@@ -1880,15 +1889,22 @@
}
public Result [] next(final long scannerId, int nbRows) throws IOException {
- checkOpen();
- List<Result> results = new ArrayList<Result>();
try {
String scannerName = String.valueOf(scannerId);
InternalScanner s = scanners.get(scannerName);
if (s == null) {
throw new UnknownScannerException("Name: " + scannerName);
}
+ try {
+ checkOpen();
+ } catch (IOException e) {
+ // If checkOpen failed, cancel this lease; filesystem is gone or we're
+ // closing or something.
+ this.leases.cancelLease(scannerName);
+ throw e;
+ }
this.leases.renewLease(scannerName);
+ List<Result> results = new ArrayList<Result>();
for (int i = 0; i < nbRows; i++) {
requestCount.incrementAndGet();
// Collect values to be returned here