Repository: curator Updated Branches: refs/heads/CURATOR-3.0 30d449ea5 -> cee1c0eab
Fixed some old naming Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/cee1c0ea Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/cee1c0ea Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/cee1c0ea Branch: refs/heads/CURATOR-3.0 Commit: cee1c0eabf1e899b239bf69c443fe1e8316a93cd Parents: 30d449e Author: randgalt <[email protected]> Authored: Tue Sep 8 17:52:32 2015 -0500 Committer: randgalt <[email protected]> Committed: Tue Sep 8 17:52:32 2015 -0500 ---------------------------------------------------------------------- .../org/apache/curator/framework/CuratorFrameworkFactory.java | 2 +- .../curator/framework/recipes/leader/TestLeaderLatch.java | 6 +++--- .../curator/framework/recipes/leader/TestLeaderSelector.java | 4 ++-- src/site/confluence/errors.confluence | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/cee1c0ea/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java ---------------------------------------------------------------------- diff --git a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java index 4db6d36..97185b5 100644 --- a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java +++ b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java @@ -359,7 +359,7 @@ public class CuratorFrameworkFactory * @param connectionStateErrorPolicy new error policy * @return this */ - public Builder errorPolicy(ConnectionStateErrorPolicy connectionStateErrorPolicy) + public Builder connectionStateErrorPolicy(ConnectionStateErrorPolicy connectionStateErrorPolicy) { this.connectionStateErrorPolicy = connectionStateErrorPolicy; return this; http://git-wip-us.apache.org/repos/asf/curator/blob/cee1c0ea/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderLatch.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderLatch.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderLatch.java index ac88fe7..ecaa433 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderLatch.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderLatch.java @@ -73,7 +73,7 @@ public class TestLeaderLatch extends BaseClassForTests .connectionTimeoutMs(10000) .sessionTimeoutMs(60000) .retryPolicy(new RetryOneTime(1)) - .errorPolicy(isSessionIteration ? new SessionConnectionStateErrorPolicy() : new StandardConnectionStateErrorPolicy()) + .connectionStateErrorPolicy(isSessionIteration ? new SessionConnectionStateErrorPolicy() : new StandardConnectionStateErrorPolicy()) .build(); final BlockingQueue<String> states = Queues.newLinkedBlockingQueue(); ConnectionStateListener stateListener = new ConnectionStateListener() @@ -143,7 +143,7 @@ public class TestLeaderLatch extends BaseClassForTests .connectionTimeoutMs(1000) .sessionTimeoutMs(timing.session()) .retryPolicy(new RetryOneTime(1)) - .errorPolicy(new StandardConnectionStateErrorPolicy()) + .connectionStateErrorPolicy(new StandardConnectionStateErrorPolicy()) .build(); try { @@ -195,7 +195,7 @@ public class TestLeaderLatch extends BaseClassForTests .connectionTimeoutMs(1000) .sessionTimeoutMs(timing.session()) .retryPolicy(new RetryOneTime(1)) - .errorPolicy(new SessionConnectionStateErrorPolicy()) + .connectionStateErrorPolicy(new SessionConnectionStateErrorPolicy()) .build(); client.getConnectionStateListenable().addListener(stateListener); client.start(); http://git-wip-us.apache.org/repos/asf/curator/blob/cee1c0ea/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderSelector.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderSelector.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderSelector.java index 510e515..e9a7002 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderSelector.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderSelector.java @@ -64,7 +64,7 @@ public class TestLeaderSelector extends BaseClassForTests .connectionTimeoutMs(timing.connection()) .sessionTimeoutMs(timing.session()) .retryPolicy(new RetryOneTime(1)) - .errorPolicy(new StandardConnectionStateErrorPolicy()) + .connectionStateErrorPolicy(new StandardConnectionStateErrorPolicy()) .build(); try { @@ -121,7 +121,7 @@ public class TestLeaderSelector extends BaseClassForTests .connectionTimeoutMs(timing.connection()) .sessionTimeoutMs(timing.session()) .retryPolicy(new RetryOneTime(1)) - .errorPolicy(new SessionConnectionStateErrorPolicy()) + .connectionStateErrorPolicy(new SessionConnectionStateErrorPolicy()) .build(); client.getConnectionStateListenable().addListener(stateListener); client.start(); http://git-wip-us.apache.org/repos/asf/curator/blob/cee1c0ea/src/site/confluence/errors.confluence ---------------------------------------------------------------------- diff --git a/src/site/confluence/errors.confluence b/src/site/confluence/errors.confluence index 2fd51d4..f58c8d7 100644 --- a/src/site/confluence/errors.confluence +++ b/src/site/confluence/errors.confluence @@ -36,7 +36,7 @@ h2. Error Policy Curator has a pluggable error policy. The default policy takes the conservative approach of treating connection states SUSPENDED and LOST the same way. i.e. when a recipe sees the state change to SUSPENDED it will assume that the ZooKeeper session is lost and will clean up any watchers, nodes, etc. You can choose, however, a more aggressive approach by setting the error policy to only treat LOST (i.e. true session loss) as an error state. Do this in the CuratorFrameworkFactory via: -{{errorPolicy(new SessionErrorPolicy())}}. +{{connectionStateErrorPolicy(new SessionConnectionStateErrorPolicy())}}. h2. Recipes In general, the recipes attempt to deal with errors and connection issues. See the doc for each recipe for details on how it deals with errors.
