Author: stack
Date: Mon May 2 18:04:19 2011
New Revision: 1098696
URL: http://svn.apache.org/viewvc?rev=1098696&view=rev
Log:
HBASE-3843 splitLogWorker starts too early
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1098696&r1=1098695&r2=1098696&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Mon May 2 18:04:19 2011
@@ -92,6 +92,7 @@ Release 0.91.0 - Unreleased
HBASE-3827 hbase-1502, removing heartbeats, broke master joining a running
cluster and was returning master hostname for rs to use
HBASE-3829 TestMasterFailover failures in jenkins
+ HBASE-3843 splitLogWorker starts too early (Prakash Khemani)
IMPROVEMENTS
HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack)
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1098696&r1=1098695&r2=1098696&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Mon May 2 18:04:19 2011
@@ -537,11 +537,6 @@ public class HRegionServer implements HR
this.catalogTracker = new CatalogTracker(this.zooKeeper, this.connection,
this, this.conf.getInt("hbase.regionserver.catalog.timeout",
Integer.MAX_VALUE));
catalogTracker.start();
-
- // Create the log splitting worker and start it
- this.splitLogWorker = new SplitLogWorker(this.zooKeeper,
- this.getConfiguration(), this.getServerName().toString());
- splitLogWorker.start();
}
/**
@@ -1274,6 +1269,11 @@ public class HRegionServer implements HR
// Start Server. This service is like leases in that it internally runs
// a thread.
this.rpcServer.start();
+
+ // Create the log splitting worker and start it
+ this.splitLogWorker = new SplitLogWorker(this.zooKeeper,
+ this.getConfiguration(), this.getServerName().toString());
+ splitLogWorker.start();
}
/**
