svn commit: r1213479 - /hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java

[st...@apache.org]

Author: stack
Date: Mon Dec 12 22:46:33 2011
New Revision: 1213479

URL: http://svn.apache.org/viewvc?rev=1213479&view=rev
Log:
HBASE-4997 SplitLogManager can have a race on batch.installed

Modified:
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java?rev=1213479&r1=1213478&r2=1213479&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java Mon Dec 12 22:46:33 2011
@@ -351,9 +351,7 @@ public class SplitLogManager extends Zoo
             } else {
               task.batch.error++;
             }
-            if ((task.batch.done + task.batch.error) == task.batch.installed) {
-              task.batch.notify();
-            }
+            task.batch.notify();
           }
         }
       }
@@ -607,9 +605,9 @@ public class SplitLogManager extends Zoo
     // a single thread touches batch.installed.
     oldtask = tasks.putIfAbsent(path, new Task(batch));
     if (oldtask != null) {
+      // new task was not used.
+      batch.installed--;
       synchronized (oldtask) {
-        // new task was not used.
-        batch.installed--;
         if (oldtask.isOrphan()) {
           if (oldtask.deleted) {
             // The task is already done. Do not install the batch for this
@@ -618,12 +616,12 @@ public class SplitLogManager extends Zoo
             // this task to complete.
             return (null);
           }
-          LOG.info("Previously orphan task " + path +
-              " is now being waited upon");
           oldtask.setBatch(batch);
-          return (null);
         }
       }
+      LOG.info("Previously orphan task " + path +
+          " is now being waited upon");
+      return (null);
     }
     return oldtask;
   }