You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/02/27 23:57:51 UTC
svn commit: r1451015 -
/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
Author: kturner
Date: Wed Feb 27 22:57:51 2013
New Revision: 1451015
URL: http://svn.apache.org/r1451015
Log:
ACCUMULO-1125 delete distributed work queue task lock when task fails
Modified:
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java?rev=1451015&r1=1451014&r2=1451015&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java (original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java Wed Feb 27 22:57:51 2013
@@ -107,17 +107,16 @@ public class DistributedWorkQueue {
log.error("Error received when trying to delete entry in zookeeper " + childPath, e);
}
- // TODO always delete this
- try {
- zoo.recursiveDelete(lockPath, NodeMissingPolicy.SKIP);
- } catch (Exception e) {
- log.error("Error received when trying to delete entry in zookeeper " + childPath, e);
- }
-
} catch (Exception e) {
log.warn("Failed to process work " + child, e);
}
+ try {
+ zoo.recursiveDelete(lockPath, NodeMissingPolicy.SKIP);
+ } catch (Exception e) {
+ log.error("Error received when trying to delete entry in zookeeper " + childPath, e);
+ }
+
} finally {
numTask.decrementAndGet();
}