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/10/29 01:01:45 UTC
svn commit: r830801 - in
/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver:
CompactSplitThread.java HRegionServer.java MemStoreFlusher.java
Author: stack
Date: Thu Oct 29 00:01:44 2009
New Revision: 830801
URL: http://svn.apache.org/viewvc?rev=830801&view=rev
Log:
HBASE-1816 Master rewrite; should have removed safe-mode from client-side too...
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java?rev=830801&r1=830800&r2=830801&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java Thu Oct 29 00:01:44 2009
@@ -39,10 +39,6 @@
/**
* Compact region on request and then run split if appropriate
- *
- * NOTE: This class extends Thread rather than Chore because the sleep time
- * can be interrupted when there is something to do, rather than the Chore
- * sleep time which is invariant.
*/
class CompactSplitThread extends Thread implements HConstants {
static final Log LOG = LogFactory.getLog(CompactSplitThread.class);
@@ -74,7 +70,7 @@
@Override
public void run() {
- while (!this.server.isStopRequested() && this.server.isInSafeMode()) {
+ while (!this.server.isStopRequested()) {
try {
Thread.sleep(this.frequency);
} catch (InterruptedException ex) {
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=830801&r1=830800&r2=830801&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 Thu Oct 29 00:01:44 2009
@@ -126,8 +126,6 @@
protected final AtomicBoolean quiesced = new AtomicBoolean(false);
- protected final AtomicBoolean safeMode = new AtomicBoolean(true);
-
// Go down hard. Used if file system becomes unavailable and also in
// debugging and unit tests.
protected volatile boolean abortRequested;
@@ -861,28 +859,15 @@
}
/**
- * Thread for toggling safemode after some configurable interval.
+ * Thread that gradually ups compaction limit.
*/
private class CompactionLimitThread extends Thread {
protected CompactionLimitThread() {}
@Override
public void run() {
- // First wait until we exit safe mode
- synchronized (safeMode) {
- while(safeMode.get()) {
- LOG.debug("Waiting to exit safe mode");
- try {
- safeMode.wait();
- } catch (InterruptedException e) {
- // ignore
- }
- }
- }
-
- // now that safemode is off, slowly increase the per-cycle compaction
- // limit, finally setting it to unlimited (-1)
-
+ // Slowly increase per-cycle compaction limit, finally setting it to
+ // unlimited (-1)
int compactionCheckInterval =
conf.getInt("hbase.regionserver.thread.splitcompactcheckfrequency",
20 * 1000);
@@ -1145,16 +1130,9 @@
}
}
- // Set up the safe mode handler if safe mode has been configured.
- if (!conf.getBoolean("hbase.regionserver.safemode", true)) {
- safeMode.set(false);
- compactSplitThread.setLimit(-1);
- LOG.debug("skipping safe mode");
- } else {
- this.compactionLimitThread = new CompactionLimitThread();
- Threads.setDaemonThreadRunning(this.compactionLimitThread, n + ".safeMode",
- handler);
- }
+ this.compactionLimitThread = new CompactionLimitThread();
+ Threads.setDaemonThreadRunning(this.compactionLimitThread, n +
+ ".compactionLimitThread", handler);
// Start Server. This service is like leases in that it internally runs
// a thread.
@@ -2109,13 +2087,6 @@
}
/**
- * @return true if the region server is in safe mode
- */
- public boolean isInSafeMode() {
- return safeMode.get();
- }
-
- /**
*
* @return the configuration
*/
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java?rev=830801&r1=830800&r2=830801&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java Thu Oct 29 00:01:44 2009
@@ -132,7 +132,7 @@
@Override
public void run() {
- while (!this.server.isStopRequested() && this.server.isInSafeMode()) {
+ while (!this.server.isStopRequested()) {
try {
Thread.sleep(threadWakeFrequency);
} catch (InterruptedException ex) {