curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [10/20] curator git commit: finalized usage and APIs. Made sure is backward compatible to 3.4.6
Date Wed, 01 Jul 2015 23:01:27 GMT
finalized usage and APIs. Made sure is backward compatible to 3.4.6


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/759ae682
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/759ae682
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/759ae682

Branch: refs/heads/master
Commit: 759ae68274ddfc38f18994021d31a5a08dac1066
Parents: 25dcef9
Author: randgalt <randgalt@apache.org>
Authored: Wed Jun 17 20:40:15 2015 -0500
Committer: randgalt <randgalt@apache.org>
Committed: Wed Jun 17 20:40:15 2015 -0500

----------------------------------------------------------------------
 .../org/apache/curator/utils/DebugUtils.java    |  1 +
 .../org/apache/curator/utils/EnsurePath.java    |  2 +
 .../java/org/apache/curator/utils/ZKPaths.java  | 14 +++++-
 .../curator/framework/CuratorFramework.java     |  1 +
 .../api/CreateBackgroundModeACLable.java        |  7 ++-
 .../curator/framework/api/CreateBuilder.java    |  7 ++-
 .../curator/framework/api/ExistsBuilder.java    | 15 ++++--
 .../framework/api/ExistsBuilderMain.java        | 27 ++++++++++
 .../framework/imps/CreateBuilderImpl.java       | 12 ++---
 .../framework/imps/ExistsBuilderImpl.java       | 53 +++++++++++++++++---
 .../curator/framework/imps/TestFramework.java   | 21 ++++++++
 .../recipes/atomic/DistributedAtomicValue.java  |  2 +-
 .../framework/recipes/cache/NodeCache.java      |  7 +--
 .../recipes/cache/PathChildrenCache.java        | 21 +++++---
 .../recipes/queue/SimpleDistributedQueue.java   | 16 ++++++
 .../recipes/cache/TestPathChildrenCache.java    | 10 ++--
 .../locks/TestInterProcessMutexBase.java        |  8 +++
 .../apache/curator/test/BaseClassForTests.java  | 28 ++++++++---
 pom.xml                                         |  2 +-
 19 files changed, 212 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java b/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
index ce751ec..b098989 100644
--- a/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
+++ b/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
@@ -23,6 +23,7 @@ public class DebugUtils
     public static final String          PROPERTY_LOG_EVENTS = "curator-log-events";
     public static final String          PROPERTY_DONT_LOG_CONNECTION_ISSUES = "curator-dont-log-connection-problems";
     public static final String          PROPERTY_LOG_ONLY_FIRST_CONNECTION_ISSUE_AS_ERROR_LEVEL
= "curator-log-only-first-connection-issue-as-error-level";
+    public static final String          PROPERTY_RETRY_FAILED_TESTS = "curator-retry-failed-tests";
 
     private DebugUtils()
     {

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-client/src/main/java/org/apache/curator/utils/EnsurePath.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/utils/EnsurePath.java b/curator-client/src/main/java/org/apache/curator/utils/EnsurePath.java
index 3abb618..a4a8528 100644
--- a/curator-client/src/main/java/org/apache/curator/utils/EnsurePath.java
+++ b/curator-client/src/main/java/org/apache/curator/utils/EnsurePath.java
@@ -47,6 +47,8 @@ import java.util.concurrent.atomic.AtomicReference;
  *         ensurePath.ensure(zk);   // subsequent times are NOPs
  *         zk.create(nodePath, ...);
  * </pre>
+ *
+ * @deprecated Prefer CuratorFramework.create().creatingParentContainersIfNeeded() or CuratorFramework.exists().creatingParentContainersIfNeeded()
  */
 public class EnsurePath
 {

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java b/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java
index f025fa6..75e1171 100644
--- a/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java
+++ b/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java
@@ -38,6 +38,8 @@ public class ZKPaths
      */
     public static final String PATH_SEPARATOR = "/";
 
+    private static final CreateMode NON_CONTAINER_MODE = CreateMode.PERSISTENT;
+
     /**
      * @return {@link CreateMode#CONTAINER} if the ZK JAR supports it. Otherwise {@link CreateMode#PERSISTENT}
      */
@@ -46,6 +48,16 @@ public class ZKPaths
         return CreateModeHolder.containerCreateMode;
     }
 
+    /**
+     * Returns true if the version of ZooKeeper client in use supports containers
+     *
+     * @return true/false
+     */
+    public static boolean hasContainerSupport()
+    {
+        return getContainerCreateMode() != NON_CONTAINER_MODE;
+    }
+
     private static class CreateModeHolder
     {
         private static final Logger log = LoggerFactory.getLogger(ZKPaths.class);
@@ -60,7 +72,7 @@ public class ZKPaths
             }
             catch ( IllegalArgumentException ignore )
             {
-                localCreateMode = CreateMode.PERSISTENT;
+                localCreateMode = NON_CONTAINER_MODE;
                 log.warn("The version of ZooKeeper being used doesn't support Container nodes.
CreateMode.PERSISTENT will be used instead.");
             }
             containerCreateMode = localCreateMode;

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
index fe03dc6..fdf583c 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
@@ -202,6 +202,7 @@ public interface CuratorFramework extends Closeable
      *
      * @param path path to ensure
      * @return new EnsurePath instance
+     * @deprecated prefer {@link CreateBuilder#creatingParentContainersIfNeeded()} or {@link
ExistsBuilder#creatingParentContainersIfNeeded()}
      */
     public EnsurePath newNamespaceAwareEnsurePath(String path);
 

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-framework/src/main/java/org/apache/curator/framework/api/CreateBackgroundModeACLable.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/api/CreateBackgroundModeACLable.java
b/curator-framework/src/main/java/org/apache/curator/framework/api/CreateBackgroundModeACLable.java
index 3dc9c21..e821d3b 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/api/CreateBackgroundModeACLable.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/api/CreateBackgroundModeACLable.java
@@ -18,6 +18,8 @@
  */
 package org.apache.curator.framework.api;
 
+import org.apache.zookeeper.CreateMode;
+
 public interface CreateBackgroundModeACLable extends
     BackgroundPathAndBytesable<String>,
     CreateModable<ACLBackgroundPathAndBytesable<String>>,
@@ -31,7 +33,10 @@ public interface CreateBackgroundModeACLable extends
     public ACLCreateModePathAndBytesable<String>    creatingParentsIfNeeded();
 
     /**
-     * Causes any parent nodes to get created as containers if they haven't already been
+     * Causes any parent nodes to get created using {@link CreateMode#CONTAINER} if they
haven't already been.
+     * IMPORTANT NOTE: container creation is a new feature in recent versions of ZooKeeper.
+     * If the ZooKeeper version you're using does not support containers, the parent nodes
+     * are created as ordinary PERSISTENT nodes.
      *
      * @return this
      */

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-framework/src/main/java/org/apache/curator/framework/api/CreateBuilder.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/api/CreateBuilder.java
b/curator-framework/src/main/java/org/apache/curator/framework/api/CreateBuilder.java
index 9e6ad15..5e1bc56 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/api/CreateBuilder.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/api/CreateBuilder.java
@@ -18,6 +18,8 @@
  */
 package org.apache.curator.framework.api;
 
+import org.apache.zookeeper.CreateMode;
+
 public interface CreateBuilder extends
     BackgroundPathAndBytesable<String>,
     CreateModable<ACLBackgroundPathAndBytesable<String>>,
@@ -32,7 +34,10 @@ public interface CreateBuilder extends
     public ProtectACLCreateModePathAndBytesable<String> creatingParentsIfNeeded();
 
     /**
-     * Causes any parent nodes to get created as containers if they haven't already been
+     * Causes any parent nodes to get created using {@link CreateMode#CONTAINER} if they
haven't already been.
+     * IMPORTANT NOTE: container creation is a new feature in recent versions of ZooKeeper.
+     * If the ZooKeeper version you're using does not support containers, the parent nodes
+     * are created as ordinary PERSISTENT nodes.
      *
      * @return this
      */

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-framework/src/main/java/org/apache/curator/framework/api/ExistsBuilder.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/api/ExistsBuilder.java
b/curator-framework/src/main/java/org/apache/curator/framework/api/ExistsBuilder.java
index b39fea9..7fb00ac 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/api/ExistsBuilder.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/api/ExistsBuilder.java
@@ -16,12 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.curator.framework.api;
 
-import org.apache.zookeeper.data.Stat;
+import org.apache.zookeeper.CreateMode;
 
 public interface ExistsBuilder extends
-    Watchable<BackgroundPathable<Stat>>,
-    BackgroundPathable<Stat>
+    ExistsBuilderMain
 {
+    /**
+     * Causes any parent nodes to get created using {@link CreateMode#CONTAINER} if they
haven't already been.
+     * IMPORTANT NOTE: container creation is a new feature in recent versions of ZooKeeper.
+     * If the ZooKeeper version you're using does not support containers, the parent nodes
+     * are created as ordinary PERSISTENT nodes.
+     *
+     * @return this
+     */
+    ExistsBuilderMain creatingParentContainersIfNeeded();
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-framework/src/main/java/org/apache/curator/framework/api/ExistsBuilderMain.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/api/ExistsBuilderMain.java
b/curator-framework/src/main/java/org/apache/curator/framework/api/ExistsBuilderMain.java
new file mode 100644
index 0000000..2519616
--- /dev/null
+++ b/curator-framework/src/main/java/org/apache/curator/framework/api/ExistsBuilderMain.java
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.curator.framework.api;
+
+import org.apache.zookeeper.data.Stat;
+
+public interface ExistsBuilderMain extends
+    Watchable<BackgroundPathable<Stat>>,
+    BackgroundPathable<Stat>
+{
+}

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
index 4a669b2..7a4a96f 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
@@ -517,7 +517,7 @@ class CreateBuilderImpl implements CreateBuilder, BackgroundOperation<PathAndByt
 
                         if ( (rc == KeeperException.Code.NONODE.intValue()) && createParentsIfNeeded
)
                         {
-                            backgroundCreateParentsThenNode(operationAndData);
+                            backgroundCreateParentsThenNode(client, operationAndData, operationAndData.getData().getPath(),
backgrounding, createParentsAsContainers);
                         }
                         else
                         {
@@ -534,16 +534,16 @@ class CreateBuilderImpl implements CreateBuilder, BackgroundOperation<PathAndByt
         return PROTECTED_PREFIX + protectedId + "-";
     }
 
-    private void backgroundCreateParentsThenNode(final OperationAndData<PathAndBytes>
mainOperationAndData)
+    static <T> void backgroundCreateParentsThenNode(final CuratorFrameworkImpl client,
final OperationAndData<T> mainOperationAndData, final String path, Backgrounding backgrounding,
final boolean createParentsAsContainers)
     {
-        BackgroundOperation<PathAndBytes> operation = new BackgroundOperation<PathAndBytes>()
+        BackgroundOperation<T> operation = new BackgroundOperation<T>()
         {
             @Override
-            public void performBackgroundOperation(OperationAndData<PathAndBytes> dummy)
throws Exception
+            public void performBackgroundOperation(OperationAndData<T> dummy) throws
Exception
             {
                 try
                 {
-                    ZKPaths.mkdirs(client.getZooKeeper(), mainOperationAndData.getData().getPath(),
false, client.getAclProvider(), createParentsAsContainers);
+                    ZKPaths.mkdirs(client.getZooKeeper(), path, false, client.getAclProvider(),
createParentsAsContainers);
                 }
                 catch ( KeeperException e )
                 {
@@ -552,7 +552,7 @@ class CreateBuilderImpl implements CreateBuilder, BackgroundOperation<PathAndByt
                 client.queueOperation(mainOperationAndData);
             }
         };
-        OperationAndData<PathAndBytes> parentOperation = new OperationAndData<PathAndBytes>(operation,
mainOperationAndData.getData(), null, null, backgrounding.getContext());
+        OperationAndData<T> parentOperation = new OperationAndData<T>(operation,
mainOperationAndData.getData(), null, null, backgrounding.getContext());
         client.queueOperation(parentOperation);
     }
 

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-framework/src/main/java/org/apache/curator/framework/imps/ExistsBuilderImpl.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/ExistsBuilderImpl.java
b/curator-framework/src/main/java/org/apache/curator/framework/imps/ExistsBuilderImpl.java
index a1e2ee5..db7df9e 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/ExistsBuilderImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/ExistsBuilderImpl.java
@@ -26,8 +26,11 @@ import org.apache.curator.framework.api.CuratorEvent;
 import org.apache.curator.framework.api.CuratorEventType;
 import org.apache.curator.framework.api.CuratorWatcher;
 import org.apache.curator.framework.api.ExistsBuilder;
+import org.apache.curator.framework.api.ExistsBuilderMain;
 import org.apache.curator.framework.api.Pathable;
+import org.apache.curator.utils.ZKPaths;
 import org.apache.zookeeper.AsyncCallback;
+import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.data.Stat;
 import java.util.concurrent.Callable;
@@ -38,12 +41,21 @@ class ExistsBuilderImpl implements ExistsBuilder, BackgroundOperation<String>
     private final CuratorFrameworkImpl client;
     private Backgrounding backgrounding;
     private Watching watching;
+    private boolean createParentContainersIfNeeded;
 
     ExistsBuilderImpl(CuratorFrameworkImpl client)
     {
         this.client = client;
         backgrounding = new Backgrounding();
         watching = new Watching();
+        createParentContainersIfNeeded = false;
+    }
+
+    @Override
+    public ExistsBuilderMain creatingParentContainersIfNeeded()
+    {
+        createParentContainersIfNeeded = true;
+        return this;
     }
 
     @Override
@@ -119,8 +131,15 @@ class ExistsBuilderImpl implements ExistsBuilder, BackgroundOperation<String>
             public void processResult(int rc, String path, Object ctx, Stat stat)
             {
                 trace.commit();
-                CuratorEvent event = new CuratorEventImpl(client, CuratorEventType.EXISTS,
rc, path, null, ctx, stat, null, null, null, null);
-                client.processBackgroundOperation(operationAndData, event);
+                if ( (rc == KeeperException.Code.NONODE.intValue()) && createParentContainersIfNeeded
)
+                {
+                    CreateBuilderImpl.backgroundCreateParentsThenNode(client, operationAndData,
operationAndData.getData(), backgrounding, true);
+                }
+                else
+                {
+                    CuratorEvent event = new CuratorEventImpl(client, CuratorEventType.EXISTS,
rc, path, null, ctx, stat, null, null, null, null);
+                    client.processBackgroundOperation(operationAndData, event);
+                }
             }
         };
         if ( watching.isWatched() )
@@ -163,13 +182,21 @@ class ExistsBuilderImpl implements ExistsBuilder, BackgroundOperation<String>
                 public Stat call() throws Exception
                 {
                     Stat    returnStat;
-                    if ( watching.isWatched() )
+                    try
                     {
-                        returnStat = client.getZooKeeper().exists(path, true);
+                        returnStat = callExists(path);
                     }
-                    else
+                    catch ( KeeperException.NoNodeException e )
                     {
-                        returnStat = client.getZooKeeper().exists(path, watching.getWatcher());
+                        if ( createParentContainersIfNeeded )
+                        {
+                            ZKPaths.mkdirs(client.getZooKeeper(), path, false, client.getAclProvider(),
true);
+                            returnStat = callExists(path);
+                        }
+                        else
+                        {
+                            throw e;
+                        }
                     }
                     return returnStat;
                 }
@@ -178,4 +205,18 @@ class ExistsBuilderImpl implements ExistsBuilder, BackgroundOperation<String>
         trace.commit();
         return returnStat;
     }
+
+    private Stat callExists(String path) throws Exception
+    {
+        Stat    returnStat;
+        if ( watching.isWatched() )
+        {
+            returnStat = client.getZooKeeper().exists(path, true);
+        }
+        else
+        {
+            returnStat = client.getZooKeeper().exists(path, watching.getWatcher());
+        }
+        return returnStat;
+    }
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java
b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java
index 32eea40..0a7d8dc 100644
--- a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java
+++ b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java
@@ -33,6 +33,7 @@ import org.apache.curator.test.BaseClassForTests;
 import org.apache.curator.test.Timing;
 import org.apache.curator.utils.CloseableUtils;
 import org.apache.curator.utils.EnsurePath;
+import org.apache.curator.utils.ZKPaths;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.WatchedEvent;
@@ -421,6 +422,11 @@ public class TestFramework extends BaseClassForTests
     @Test
     public void testOverrideCreateParentContainers() throws Exception
     {
+        if ( !checkForContainers() )
+        {
+            return;
+        }
+
         CuratorFramework client = CuratorFrameworkFactory.builder()
             .connectString(server.getConnectString())
             .retryPolicy(new RetryOneTime(1))
@@ -449,6 +455,11 @@ public class TestFramework extends BaseClassForTests
     @Test
     public void testCreateParentContainers() throws Exception
     {
+        if ( !checkForContainers() )
+        {
+            return;
+        }
+
         CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder();
         CuratorFramework client = builder.connectString(server.getConnectString()).retryPolicy(new
RetryOneTime(1)).build();
         try
@@ -471,6 +482,16 @@ public class TestFramework extends BaseClassForTests
         }
     }
 
+    private boolean checkForContainers()
+    {
+        if ( ZKPaths.getContainerCreateMode() == CreateMode.PERSISTENT )
+        {
+            System.out.println("Not using CreateMode.CONTAINER enabled version of ZooKeeper");
+            return false;
+        }
+        return true;
+    }
+
     @Test
     public void testEnsurePathWithNamespace() throws Exception
     {

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-recipes/src/main/java/org/apache/curator/framework/recipes/atomic/DistributedAtomicValue.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/atomic/DistributedAtomicValue.java
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/atomic/DistributedAtomicValue.java
index 1a11c4a..bbd9203 100644
--- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/atomic/DistributedAtomicValue.java
+++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/atomic/DistributedAtomicValue.java
@@ -328,7 +328,7 @@ public class DistributedAtomicValue
             byte[]  newValue = makeValue.makeFrom(result.preValue);
             if ( createIt )
             {
-                client.create().forPath(path, newValue);
+                client.create().creatingParentContainersIfNeeded().forPath(path, newValue);
             }
             else
             {

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
index 0fb0219..72ee5ff 100644
--- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
+++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
@@ -29,7 +29,6 @@ import org.apache.curator.framework.api.CuratorWatcher;
 import org.apache.curator.framework.listen.ListenerContainer;
 import org.apache.curator.framework.state.ConnectionState;
 import org.apache.curator.framework.state.ConnectionStateListener;
-import org.apache.curator.utils.EnsurePath;
 import org.apache.curator.utils.PathUtils;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.WatchedEvent;
@@ -57,7 +56,6 @@ public class NodeCache implements Closeable
     private final CuratorFramework client;
     private final String path;
     private final boolean dataIsCompressed;
-    private final EnsurePath ensurePath;
     private final AtomicReference<ChildData> data = new AtomicReference<ChildData>(null);
     private final AtomicReference<State> state = new AtomicReference<State>(State.LATENT);
     private final ListenerContainer<NodeCacheListener> listeners = new ListenerContainer<NodeCacheListener>();
@@ -132,7 +130,6 @@ public class NodeCache implements Closeable
         this.client = client;
         this.path = PathUtils.validatePath(path);
         this.dataIsCompressed = dataIsCompressed;
-        ensurePath = client.newNamespaceAwareEnsurePath(path).excludingLast();
     }
 
     /**
@@ -156,10 +153,10 @@ public class NodeCache implements Closeable
     {
         Preconditions.checkState(state.compareAndSet(State.LATENT, State.STARTED), "Cannot
be started more than once");
 
-        ensurePath.ensure(client.getZookeeperClient());
-
         client.getConnectionStateListenable().addListener(connectionStateListener);
 
+        client.checkExists().creatingParentContainersIfNeeded().forPath(path);
+
         if ( buildInitial )
         {
             internalRebuild();

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
index 1cbe7ac..05ccace 100644
--- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
+++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
@@ -33,7 +33,6 @@ import org.apache.curator.framework.listen.ListenerContainer;
 import org.apache.curator.framework.state.ConnectionState;
 import org.apache.curator.framework.state.ConnectionStateListener;
 import org.apache.curator.utils.CloseableExecutorService;
-import org.apache.curator.utils.EnsurePath;
 import org.apache.curator.utils.PathUtils;
 import org.apache.curator.utils.ThreadUtils;
 import org.apache.curator.utils.ZKPaths;
@@ -73,7 +72,6 @@ public class PathChildrenCache implements Closeable
     private final CloseableExecutorService executorService;
     private final boolean cacheData;
     private final boolean dataIsCompressed;
-    private final EnsurePath ensurePath;
     private final ListenerContainer<PathChildrenCacheListener> listeners = new ListenerContainer<PathChildrenCacheListener>();
     private final ConcurrentMap<String, ChildData> currentData = Maps.newConcurrentMap();
     private final AtomicReference<Map<String, ChildData>> initialSet = new AtomicReference<Map<String,
ChildData>>();
@@ -220,7 +218,6 @@ public class PathChildrenCache implements Closeable
         this.cacheData = cacheData;
         this.dataIsCompressed = dataIsCompressed;
         this.executorService = executorService;
-        ensurePath = client.newNamespaceAwareEnsurePath(path);
     }
 
     /**
@@ -319,7 +316,7 @@ public class PathChildrenCache implements Closeable
     {
         Preconditions.checkState(!executorService.isShutdown(), "cache has been closed");
 
-        ensurePath.ensure(client.getZookeeperClient());
+        ensurePath();
 
         clear();
 
@@ -351,7 +348,7 @@ public class PathChildrenCache implements Closeable
         Preconditions.checkArgument(ZKPaths.getPathAndNode(fullPath).getPath().equals(path),
"Node is not part of this cache: " + fullPath);
         Preconditions.checkState(!executorService.isShutdown(), "cache has been closed");
 
-        ensurePath.ensure(client.getZookeeperClient());
+        ensurePath();
         internalRebuildNode(fullPath);
 
         // this is necessary so that any updates that occurred while rebuilding are taken
@@ -480,7 +477,7 @@ public class PathChildrenCache implements Closeable
 
     void refresh(final RefreshMode mode) throws Exception
     {
-        ensurePath.ensure(client.getZookeeperClient());
+        ensurePath();
 
         final BackgroundCallback callback = new BackgroundCallback()
         {
@@ -611,6 +608,18 @@ public class PathChildrenCache implements Closeable
         }
     }
 
+    private void ensurePath() throws Exception
+    {
+        try
+        {
+            client.create().creatingParentContainersIfNeeded().forPath(path);
+        }
+        catch ( KeeperException.NodeExistsException ignore )
+        {
+            // ignore
+        }
+    }
+
     private void handleStateChange(ConnectionState newState)
     {
         switch ( newState )

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-recipes/src/main/java/org/apache/curator/framework/recipes/queue/SimpleDistributedQueue.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/queue/SimpleDistributedQueue.java
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/queue/SimpleDistributedQueue.java
index a915113..1d71c64 100644
--- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/queue/SimpleDistributedQueue.java
+++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/queue/SimpleDistributedQueue.java
@@ -176,6 +176,8 @@ public class SimpleDistributedQueue
 
     private byte[] internalPoll(long timeout, TimeUnit unit) throws Exception
     {
+        ensurePath();
+
         long            startMs = System.currentTimeMillis();
         boolean         hasTimeout = (unit != null);
         long            maxWaitMs = hasTimeout ? TimeUnit.MILLISECONDS.convert(timeout, unit)
: Long.MAX_VALUE;
@@ -213,8 +215,22 @@ public class SimpleDistributedQueue
         }
     }
 
+    private void ensurePath() throws Exception
+    {
+        try
+        {
+            client.create().creatingParentContainersIfNeeded().forPath(path);
+        }
+        catch ( KeeperException.NodeExistsException ignore )
+        {
+            // ignore
+        }
+    }
+
     private byte[] internalElement(boolean removeIt, Watcher watcher) throws Exception
     {
+        ensurePath();
+
         List<String> nodes;
         try
         {

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
index b904bdc..b07ac9c 100644
--- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
@@ -100,16 +100,16 @@ public class TestPathChildrenCache extends BaseClassForTests
         }
     }
 
-    @Test
+    @Test(enabled = false)  // I didn't write this test and it's not working. I'm not even
sure what it tests. Check into it later -JZ
     public void testClientClosedDuringRefreshErrorMessage() throws Exception
     {
-        Timing timing = new Timing();
-
         // Fiddle with logging so we can intercept the error events for org.apache.curator
         final List<LoggingEvent> events = Lists.newArrayList();
-        Collection<String> messages = Collections2.transform(events, new Function<LoggingEvent,
String>() {
+        Collection<String> messages = Collections2.transform(events, new Function<LoggingEvent,
String>()
+        {
             @Override
-            public String apply(LoggingEvent loggingEvent) {
+            public String apply(LoggingEvent loggingEvent)
+            {
                 return loggingEvent.getRenderedMessage();
             }
         });

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
index 9c1037f..99ea11f 100644
--- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
@@ -30,6 +30,8 @@ import org.apache.curator.test.KillSession;
 import org.apache.curator.test.TestingServer;
 import org.apache.curator.test.Timing;
 import org.apache.curator.utils.CloseableUtils;
+import org.apache.curator.utils.ZKPaths;
+import org.apache.zookeeper.CreateMode;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import java.util.List;
@@ -185,6 +187,12 @@ public abstract class TestInterProcessMutexBase extends BaseClassForTests
     @Test
     public void testContainerCleanup() throws Exception
     {
+        if ( !ZKPaths.hasContainerSupport() )
+        {
+            System.out.println("ZooKeeper version does not support Containers. Skipping test");
+            return;
+        }
+
         server.close();
 
         System.setProperty("container.checkIntervalMs", "10");

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
----------------------------------------------------------------------
diff --git a/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java b/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
index d676a9b..13c3138 100644
--- a/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
+++ b/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
@@ -25,6 +25,7 @@ import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeSuite;
+import java.io.IOException;
 import java.net.BindException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -34,19 +35,24 @@ public class BaseClassForTests
 
     private static final int    RETRY_WAIT_MS = 5000;
     private static final String INTERNAL_PROPERTY_DONT_LOG_CONNECTION_ISSUES;
+    private static final String INTERNAL_RETRY_FAILED_TESTS;
     static
     {
-        String s = null;
+        String logConnectionIssues = null;
+        String retryFailedTests = null;
         try
         {
             // use reflection to avoid adding a circular dependency in the pom
-            s = (String)Class.forName("org.apache.curator.utils.DebugUtils").getField("PROPERTY_DONT_LOG_CONNECTION_ISSUES").get(null);
+            Class<?> debugUtilsClazz = Class.forName("org.apache.curator.utils.DebugUtils");
+            logConnectionIssues = (String)debugUtilsClazz.getField("PROPERTY_DONT_LOG_CONNECTION_ISSUES").get(null);
+            retryFailedTests = (String)debugUtilsClazz.getField("PROPERTY_RETRY_FAILED_TESTS").get(null);
         }
         catch ( Exception e )
         {
             e.printStackTrace();
         }
-        INTERNAL_PROPERTY_DONT_LOG_CONNECTION_ISSUES = s;
+        INTERNAL_PROPERTY_DONT_LOG_CONNECTION_ISSUES = logConnectionIssues;
+        INTERNAL_RETRY_FAILED_TESTS = retryFailedTests;
     }
 
     @BeforeSuite(alwaysRun = true)
@@ -83,13 +89,23 @@ public class BaseClassForTests
     @AfterMethod
     public void teardown() throws Exception
     {
-        server.close();
-        server = null;
+        if ( server != null )
+        {
+            try
+            {
+                server.close();
+            }
+            catch ( IOException e )
+            {
+                e.printStackTrace();
+            }
+            server = null;
+        }
     }
 
     private static class RetryTest implements IRetryAnalyzer
     {
-        private final AtomicBoolean hasBeenRetried = new AtomicBoolean(false);
+        private final AtomicBoolean hasBeenRetried = new AtomicBoolean(!Boolean.getBoolean(INTERNAL_RETRY_FAILED_TESTS));
 
         @Override
         public boolean retry(ITestResult result)

http://git-wip-us.apache.org/repos/asf/curator/blob/759ae682/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9a9bd5a..efcf6f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,7 @@
         <surefire-forkcount>1</surefire-forkcount>
 
         <!-- versions -->
+        <zookeeper-version>3.4.6</zookeeper-version>
         <maven-project-info-reports-plugin-version>2.7</maven-project-info-reports-plugin-version>
         <maven-bundle-plugin-version>2.3.7</maven-bundle-plugin-version>
         <maven-javadoc-plugin-version>2.10.3</maven-javadoc-plugin-version>
@@ -74,7 +75,6 @@
         <jetty-version>6.1.26</jetty-version>
         <scannotation-version>1.0.2</scannotation-version>
         <resteasy-jaxrs-version>2.3.0.GA</resteasy-jaxrs-version>
-        <zookeeper-version>3.4.7-SNAPSHOT</zookeeper-version>
         <guava-version>16.0.1</guava-version>
         <testng-version>6.8.8</testng-version>
         <swift-version>0.12.0</swift-version>


Mime
View raw message