svn commit: r1504931 - in /hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure: Procedure.java ProcedureCoordinator.java ZKProcedureCoordinatorRpcs.java

[st...@apache.org]

Author: stack
Date: Fri Jul 19 16:28:04 2013
New Revision: 1504931

URL: http://svn.apache.org/r1504931
Log:
HBASE-8998 TestSnapshotCloneIndependence.testOnlineSnapshotMetadataChangesIndependent fails

Modified:
    hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java
    hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinator.java
    hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java

Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java?rev=1504931&r1=1504930&r2=1504931&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java Fri Jul 19 16:28:04 2013
@@ -293,7 +293,7 @@ public class Procedure implements Callab
    * @param member
    */
   public void barrierAcquiredByMember(String member) {
-    LOG.debug("member: '" + member + "' joining prepared barrier for procedure '" + procName
+    LOG.debug("member: '" + member + "' joining acquired barrier for procedure '" + procName
         + "' on coordinator");
     if (this.acquiringMembers.contains(member)) {
       synchronized (joinBarrierLock) {

Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinator.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinator.java?rev=1504931&r1=1504930&r2=1504931&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinator.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinator.java Fri Jul 19 16:28:04 2013
@@ -164,14 +164,15 @@ public class ProcedureCoordinator {
     Future<Void> f = null;
     try {
       synchronized (procedures) {
-        f = this.pool.submit(proc);
-        // if everything got started properly, we can add it known running procedures
         this.procedures.put(procName, proc);
+        f = this.pool.submit(proc);
       }
       return true;
     } catch (RejectedExecutionException e) {
       LOG.warn("Procedure " + procName + " rejected by execution pool.  Propagating error and " +
           "cancelling operation.", e);
+      // Remove the procedure from the list since is not started
+      this.procedures.remove(procName);
       // the thread pool is full and we can't run the procedure
       proc.receive(new ForeignException(procName, e));
 
@@ -258,9 +259,12 @@ public class ProcedureCoordinator {
    */
   void memberAcquiredBarrier(String procName, final String member) {
     Procedure proc = procedures.get(procName);
-    if (proc != null) {
-      proc.barrierAcquiredByMember(member);
+    if (proc == null) {
+      LOG.warn("Member '"+ member +"' is trying to acquire an unknown procedure '"+ procName +"'");
+      return;
     }
+
+    proc.barrierAcquiredByMember(member);
   }
 
   /**
@@ -271,9 +275,11 @@ public class ProcedureCoordinator {
    */
   void memberFinishedBarrier(String procName, final String member) {
     Procedure proc = procedures.get(procName);
-    if (proc != null) {
-      proc.barrierReleasedByMember(member);
+    if (proc == null) {
+      LOG.warn("Member '"+ member +"' is trying to release an unknown procedure '"+ procName +"'");
+      return;
     }
+    proc.barrierReleasedByMember(member);
   }
 
   /**

Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java?rev=1504931&r1=1504930&r2=1504931&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java Fri Jul 19 16:28:04 2013
@@ -182,6 +182,8 @@ public class ZKProcedureCoordinatorRpcs 
               ZKUtil.getNodeName(path));
           } else if (isAbortPathNode(path)) {
             abort(path);
+          } else {
+            LOG.debug("Ignoring created notification for node:" + path);
           }
         }
       };