You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jx...@apache.org on 2013/07/23 05:08:32 UTC
svn commit: r1505889 - in /hbase/branches/0.95/hbase-server/src:
main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java
test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java
Author: jxiang
Date: Tue Jul 23 03:08:31 2013
New Revision: 1505889
URL: http://svn.apache.org/r1505889
Log:
HBASE-8954 TestSplitLogWorker#testPreemptTask failed
Modified:
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java
Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java?rev=1505889&r1=1505888&r2=1505889&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java Tue Jul 23 03:08:31 2013
@@ -33,6 +33,7 @@ import org.apache.hadoop.classification.
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.SplitLogCounters;
import org.apache.hadoop.hbase.SplitLogTask;
@@ -169,8 +170,14 @@ public class SplitLogWorker extends ZooK
try {
LOG.info("SplitLogWorker " + this.serverName + " starting");
this.watcher.registerListener(this);
- // initialize a new connection for splitlogworker configuration
- HConnectionManager.getConnection(conf);
+ boolean distributedLogReplay = this.conf.getBoolean(
+ HConstants.DISTRIBUTED_LOG_REPLAY_KEY,
+ HConstants.DEFAULT_DISTRIBUTED_LOG_REPLAY_CONFIG);
+ if (distributedLogReplay) {
+ // initialize a new connection for splitlogworker configuration
+ HConnectionManager.getConnection(conf);
+ }
+
// wait for master to create the splitLogZnode
int res = -1;
while (res == -1 && !exitWorker) {
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java?rev=1505889&r1=1505888&r2=1505889&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java Tue Jul 23 03:08:31 2013
@@ -100,7 +100,6 @@ public class TestSplitLogWorker {
assertTrue(ZKUtil.checkExists(zkw, zkw.splitLogZNode) != -1);
LOG.debug(zkw.splitLogZNode + " created");
SplitLogCounters.resetCounters();
-
}
@After
@@ -201,7 +200,7 @@ public class TestSplitLogWorker {
try {
Thread.yield(); // let the worker start
Thread.sleep(1000);
- waitForCounter(SplitLogCounters.tot_wkr_task_grabing, 0, 1, 1500);
+ waitForCounter(SplitLogCounters.tot_wkr_task_grabing, 0, 1, 5000);
// this time create a task node after starting the splitLogWorker
zkw.getRecoverableZooKeeper().create(PATH,