svn commit: r1595357 - in /hbase/trunk/hbase-server/src: main/java/org/apache/hadoop/hbase/procedure/ProcedureMember.java main/java/org/apache/hadoop/hbase/procedure/Subprocedure.java test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java

[te...@apache.org]

Author: tedyu
Date: Fri May 16 21:29:41 2014
New Revision: 1595357

URL: http://svn.apache.org/r1595357
Log:
HBASE-11189 Subprocedure should be marked as complete upon failure


Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureMember.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Subprocedure.java
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureMember.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureMember.java?rev=1595357&r1=1595356&r2=1595357&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureMember.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureMember.java Fri May 16 21:29:41 2014
@@ -246,7 +246,8 @@ public class ProcedureMember implements 
           ", ignoring it.", ee);
       return; // Procedure has already completed
     }
-    LOG.error("Propagating foreign exception to subprocedure " + sub.getName(), ee);
-    sub.monitor.receive(ee);
+    String msg = "Propagating foreign exception to subprocedure " + sub.getName();
+    LOG.error(msg, ee);
+    sub.cancel(msg, ee);
   }
-}
\ No newline at end of file
+}

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Subprocedure.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Subprocedure.java?rev=1595357&r1=1595356&r2=1595357&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Subprocedure.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Subprocedure.java Fri May 16 21:29:41 2014
@@ -265,6 +265,7 @@ abstract public class Subprocedure imple
    */
   public void cancel(String msg, Throwable cause) {
     LOG.error(msg, cause);
+    complete = true;
     if (cause instanceof ForeignException) {
       monitor.receive((ForeignException) cause);
     } else {

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java?rev=1595357&r1=1595356&r2=1595357&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java Fri May 16 21:29:41 2014
@@ -231,7 +231,7 @@ public class TestZKProcedure {
     final int[] elem = new int[1];
     for (int i = 0; i < members.size(); i++) {
       ForeignExceptionDispatcher cohortMonitor = new ForeignExceptionDispatcher();
-      ProcedureMember comms = members.get(i).getFirst();
+      final ProcedureMember comms = members.get(i).getFirst();
       Subprocedure commit = Mockito
       .spy(new SubprocedureImpl(comms, opName, cohortMonitor, WAKE_FREQUENCY, TIMEOUT));
       // This nasty bit has one of the impls throw a TimeoutException
@@ -245,7 +245,8 @@ public class TestZKProcedure {
                 new TimeoutException("subprocTimeout" , 1, 2, 0));
             Subprocedure r = ((Subprocedure) invocation.getMock());
             LOG.error("Remote commit failure, not propagating error:" + remoteCause);
-            r.monitor.receive(remoteCause);
+            comms.receiveAbortProcedure(r.getName(), remoteCause);
+            assertEquals(r.isComplete(), true);
             // don't complete the error phase until the coordinator has gotten the error
             // notification (which ensures that we never progress past prepare)
             try {