Repository: oozie Updated Branches: refs/heads/master fc6cfb1b2 -> ebb3ec6d0
OOZIE-2145 ZooKeeper paths should start with a / (rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/ebb3ec6d Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/ebb3ec6d Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/ebb3ec6d Branch: refs/heads/master Commit: ebb3ec6d083d1003c943c95fb85bdf049e54778c Parents: fc6cfb1 Author: Robert Kanter <[email protected]> Authored: Fri Feb 20 10:01:22 2015 -0800 Committer: Robert Kanter <[email protected]> Committed: Fri Feb 20 10:01:22 2015 -0800 ---------------------------------------------------------------------- core/src/main/java/org/apache/oozie/service/ZKUUIDService.java | 2 +- core/src/main/java/org/apache/oozie/util/ZKUtils.java | 2 +- release-log.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/ebb3ec6d/core/src/main/java/org/apache/oozie/service/ZKUUIDService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/service/ZKUUIDService.java b/core/src/main/java/org/apache/oozie/service/ZKUUIDService.java index 6cdd28e..90227a2 100644 --- a/core/src/main/java/org/apache/oozie/service/ZKUUIDService.java +++ b/core/src/main/java/org/apache/oozie/service/ZKUUIDService.java @@ -47,7 +47,7 @@ public class ZKUUIDService extends UUIDService { public static final String CONF_SEQUENCE_MAX = CONF_PREFIX + "jobid.sequence.max"; public static final String LOCKS_NODE = "/SEQUENCE_LOCK"; - public static final String ZK_SEQUENCE_PATH = "job_id_sequence"; + public static final String ZK_SEQUENCE_PATH = "/job_id_sequence"; public static final long RESET_VALUE = 0L; public static final int RETRY_COUNT = 3; http://git-wip-us.apache.org/repos/asf/oozie/blob/ebb3ec6d/core/src/main/java/org/apache/oozie/util/ZKUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/util/ZKUtils.java b/core/src/main/java/org/apache/oozie/util/ZKUtils.java index 6162178..0ce32b1 100644 --- a/core/src/main/java/org/apache/oozie/util/ZKUtils.java +++ b/core/src/main/java/org/apache/oozie/util/ZKUtils.java @@ -322,7 +322,7 @@ public class ZKUtils { log.info("'sasl' ACLs not set; setting..."); List<String> children = client.getZookeeperClient().getZooKeeper().getChildren(namespace, null); for (String child : children) { - checkAndSetACLs(child); + checkAndSetACLs("/" + child); } client.getZookeeperClient().getZooKeeper().setACL(namespace, saslACL, -1); } http://git-wip-us.apache.org/repos/asf/oozie/blob/ebb3ec6d/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 02462d7..d82e578 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2145 ZooKeeper paths should start with a "/" (rkanter) OOZIE-2113 Oozie Command Line Utilities are failing as hadoop-auth jar not found (shwethags) OOZIE-1688 New configuration to specify server-server authentication type (puru) OOZIE-2090 wf:lastErrorNode does not take into account transient errors with retries (ranter)
