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 01:30:01 UTC
svn commit: r794906 - in /hadoop/hbase/branches/0.19: CHANGES.txt
src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: stack
Date: Thu Jul 16 23:30:01 2009
New Revision: 794906
URL: http://svn.apache.org/viewvc?rev=794906&view=rev
Log:
HBASE-1583 Start/Stop of large cluster untenable
Modified:
hadoop/hbase/branches/0.19/CHANGES.txt
hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hadoop/hbase/branches/0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.19/CHANGES.txt?rev=794906&r1=794905&r2=794906&view=diff
==============================================================================
--- hadoop/hbase/branches/0.19/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.19/CHANGES.txt Thu Jul 16 23:30:01 2009
@@ -23,6 +23,7 @@
HBASE-1662 Tool to run major compaction on catalog regions when hbase
is shutdown
HBASE-1664 Disable 1058 on catalog tables
+ HBASE-1583 Start/Stop of large cluster untenable
Release 0.19.3 - May 27th, 2009
BUG FIXES
Modified: hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=794906&r1=794905&r2=794906&view=diff
==============================================================================
--- hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java Thu Jul 16 23:30:01 2009
@@ -144,6 +144,20 @@
*/
private volatile boolean forceMajorCompaction = false;
+ /**
+ * @return True if this region has references.
+ */
+ boolean hasReferences() {
+ for (Map.Entry<Integer, HStore> e: this.stores.entrySet()) {
+ for (Map.Entry<Long, HStoreFile> ee:
+ e.getValue().getStorefiles().entrySet()) {
+ // Found a reference, return.
+ if (ee.getValue().isReference()) return true;
+ }
+ }
+ return false;
+ }
+
/*
* Data structure of write state flags used coordinating flushes,
* compactions and closes.
@@ -705,6 +719,10 @@
*/
byte [] compactStores(final boolean majorCompaction)
throws IOException {
+ if (this.closing.get() || this.closed.get()) {
+ LOG.debug("Skipping compaction because closing/closed");
+ return null;
+ }
splitsAndClosesLock.readLock().lock();
try {
byte [] midKey = null;
Modified: hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=794906&r1=794905&r2=794906&view=diff
==============================================================================
--- hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Thu Jul 16 23:30:01 2009
@@ -1351,9 +1351,10 @@
if (region == null) {
try {
region = instantiateRegion(regionInfo);
- // Startup a compaction early if one is needed.
- this.compactSplitThread.
- compactionRequested(region, "Region open check");
+ // Startup a compaction early if one is needed, if region has references.
+ if (region.hasReferences()) {
+ this.compactSplitThread.compactionRequested(region, "Region open");
+ }
} catch (Throwable e) {
Throwable t = cleanup(e,
"Error opening " + regionInfo.getRegionNameAsString());