Author: rkanter
Date: Wed Nov 13 21:32:13 2013
New Revision: 1541733
URL: http://svn.apache.org/r1541733
Log:
OOZIE-1606 Update Curator to 2.3.0 and fix some misc minor ZK related things
(rkanter)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/service/ZKLocksService.java
oozie/trunk/core/src/test/java/org/apache/oozie/test/ZKXTestCase.java
oozie/trunk/pom.xml
oozie/trunk/release-log.txt
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/service/ZKLocksService.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/ZKLocksService.java?rev=1541733&r1=1541732&r2=1541733&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/ZKLocksService.java
(original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/ZKLocksService.java
Wed Nov 13 21:32:13 2013
@@ -102,8 +102,8 @@ public class ZKLocksService extends Memo
@Override
public LockToken getWriteLock(String resource, long wait) throws
InterruptedException {
InterProcessReadWriteLock lock = new
InterProcessReadWriteLock(zk.getClient(), LOCKS_NODE + resource);
- InterProcessMutex readLock = lock.writeLock();
- return acquireLock(wait, readLock);
+ InterProcessMutex writeLock = lock.writeLock();
+ return acquireLock(wait, writeLock);
}
private LockToken acquireLock(long wait, InterProcessMutex lock) {
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/test/ZKXTestCase.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/test/ZKXTestCase.java?rev=1541733&r1=1541732&r2=1541733&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/test/ZKXTestCase.java
(original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/test/ZKXTestCase.java Wed
Nov 13 21:32:13 2013
@@ -20,7 +20,6 @@ package org.apache.oozie.test;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.io.FileUtils;
import org.apache.curator.RetryPolicy;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
@@ -75,9 +74,7 @@ public abstract class ZKXTestCase extend
client.close();
client = null;
zkServer.stop();
- // If we don't delete the temp dir used by ZK, it will quickly start
eating up GBs of space as every test method creates a
- // new dir about 70MB
- FileUtils.deleteDirectory(zkServer.getTempDirectory());
+ zkServer.close(); // also deletes the temp dir so we don't start
eating up GBs of space
}
/**
Modified: oozie/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/pom.xml?rev=1541733&r1=1541732&r2=1541733&view=diff
==============================================================================
--- oozie/trunk/pom.xml (original)
+++ oozie/trunk/pom.xml Wed Nov 13 21:32:13 2013
@@ -702,19 +702,19 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
- <version>2.2.0-incubating</version>
+ <version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery</artifactId>
- <version>2.2.0-incubating</version>
+ <version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
- <version>2.2.0-incubating</version>
+ <version>2.3.0</version>
</dependency>
<!-- examples -->
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1541733&r1=1541732&r2=1541733&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Wed Nov 13 21:32:13 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1606 Update Curator to 2.3.0 and fix some misc minor ZK related things
(rkanter)
OOZIE-1544 Support variables for coord data-in/data-out dataset (puru via
rohini)
OOZIE-1603 cannot submit job to oozie on mysql (virag)
OOZIE-1600 map-reduce actions without configuration section in workflow.xml
throws "IllegalArgumentException: element cannot be null" (bowenzhangusa via
rkanter)
