svn commit: r1508591 - in /hbase/trunk/hbase-server/src: main/java/org/apache/hadoop/hbase/SplitLogCounters.java main/java/org/apache/hadoop/hbase/master/SplitLogManager.java test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java

[jxiang]

Author: jxiang
Date: Tue Jul 30 19:57:04 2013
New Revision: 1508591

URL: http://svn.apache.org/r1508591
Log:
HBASE-9088 TestSplitLogManager.testMultipleResubmits fails

Modified:
    
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogCounters.java
    
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
    
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogCounters.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogCounters.java?rev=1508591&r1=1508590&r2=1508591&view=diff
==============================================================================
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogCounters.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogCounters.java
 Tue Jul 30 19:57:04 2013
@@ -64,6 +64,7 @@ public class SplitLogCounters {
   public final static AtomicLong tot_mgr_resubmit_unassigned = new 
AtomicLong(0);
   public final static AtomicLong tot_mgr_relist_logdir = new AtomicLong(0);
   public final static AtomicLong tot_mgr_resubmit_dead_server_task = new 
AtomicLong(0);
+  public final static AtomicLong tot_mgr_resubmit_force = new AtomicLong(0);
 
   // SplitLogWorker counters
   public final static AtomicLong tot_wkr_failed_to_grab_task_no_data = new 
AtomicLong(0);

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java?rev=1508591&r1=1508590&r2=1508591&view=diff
==============================================================================
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
 Tue Jul 30 19:57:04 2013
@@ -865,6 +865,7 @@ public class SplitLogManager extends Zoo
       // race with heartbeat() that might be changing last_version
       version = task.last_version;
     } else {
+      SplitLogCounters.tot_mgr_resubmit_force.incrementAndGet();
       version = -1;
     }
     LOG.info("resubmitting task " + path);

Modified: 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java?rev=1508591&r1=1508590&r2=1508591&view=diff
==============================================================================
--- 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
 (original)
+++ 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
 Tue Jul 30 19:57:04 2013
@@ -30,6 +30,7 @@ import static org.apache.hadoop.hbase.Sp
 import static org.apache.hadoop.hbase.SplitLogCounters.tot_mgr_resubmit;
 import static 
org.apache.hadoop.hbase.SplitLogCounters.tot_mgr_resubmit_dead_server_task;
 import static org.apache.hadoop.hbase.SplitLogCounters.tot_mgr_resubmit_failed;
+import static org.apache.hadoop.hbase.SplitLogCounters.tot_mgr_resubmit_force;
 import static 
org.apache.hadoop.hbase.SplitLogCounters.tot_mgr_resubmit_threshold_reached;
 import static 
org.apache.hadoop.hbase.SplitLogCounters.tot_mgr_resubmit_unassigned;
 import static org.apache.hadoop.hbase.SplitLogCounters.tot_mgr_task_deleted;
@@ -287,7 +288,7 @@ public class TestSplitLogManager {
     waitForCounter(tot_mgr_heartbeat, 1, 2, to/2);
     waitForCounter(tot_mgr_resubmit_threshold_reached, 0, 1, to + to/2);
     Thread.sleep(to + to/2);
-    assertEquals(2L, tot_mgr_resubmit.get());
+    assertEquals(2L, tot_mgr_resubmit.get() - tot_mgr_resubmit_force.get());
   }
 
   @Test