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/16 01:10:55 UTC
svn commit: r1503513 - in /hbase/branches/0.95/hbase-server/src:
main/java/org/apache/hadoop/hbase/
main/java/org/apache/hadoop/hbase/regionserver/
test/java/org/apache/hadoop/hbase/regionserver/
Author: jxiang
Date: Mon Jul 15 23:10:54 2013
New Revision: 1503513
URL: http://svn.apache.org/r1503513
Log:
HBASE-8954 TestSplitLogWorker#testPreemptTask failed
Modified:
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogCounters.java
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/SplitLogCounters.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogCounters.java?rev=1503513&r1=1503512&r2=1503513&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogCounters.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogCounters.java Mon Jul 15 23:10:54 2013
@@ -82,6 +82,7 @@ public class SplitLogCounters {
public final static AtomicLong tot_wkr_preempt_task = new AtomicLong(0);
public final static AtomicLong tot_wkr_task_heartbeat_failed = new AtomicLong(0);
public final static AtomicLong tot_wkr_final_transition_failed = new AtomicLong(0);
+ public final static AtomicLong tot_wkr_task_grabing = new AtomicLong(0);
public static void resetCounters() throws Exception {
Class<?> cl = (new SplitLogCounters()).getClass();
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=1503513&r1=1503512&r2=1503513&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 Mon Jul 15 23:10:54 2013
@@ -240,6 +240,7 @@ public class SplitLogWorker extends ZooK
return;
}
}
+ SplitLogCounters.tot_wkr_task_grabing.incrementAndGet();
synchronized (taskReadyLock) {
while (seq_start == taskReadySeq) {
try {
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=1503513&r1=1503512&r2=1503513&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 Mon Jul 15 23:10:54 2013
@@ -201,6 +201,7 @@ public class TestSplitLogWorker {
try {
Thread.yield(); // let the worker start
Thread.sleep(1000);
+ waitForCounter(SplitLogCounters.tot_wkr_task_grabing, 0, 1, 1500);
// this time create a task node after starting the splitLogWorker
zkw.getRecoverableZooKeeper().create(PATH,
@@ -231,6 +232,8 @@ public class TestSplitLogWorker {
try {
Thread.yield(); // let the worker start
Thread.sleep(100);
+ waitForCounter(SplitLogCounters.tot_wkr_task_grabing, 0, 1, 1500);
+
SplitLogTask unassignedManager = new SplitLogTask.Unassigned(MANAGER);
zkw.getRecoverableZooKeeper().create(PATH1, unassignedManager.toByteArray(),
Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);