You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2018/12/09 17:28:38 UTC
[1/4] curator git commit: Merge branch 'CURATOR-491'
Repository: curator
Updated Branches:
refs/heads/CURATOR-490 4c993572f -> b94844af5
Merge branch 'CURATOR-491'
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/2adccc54
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/2adccc54
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/2adccc54
Branch: refs/heads/CURATOR-490
Commit: 2adccc54976ce028d8cfe4bf1e7ac6c404829e78
Parents: d7774c4 49d08cc
Author: randgalt <ra...@apache.org>
Authored: Sun Dec 9 02:27:54 2018 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Dec 9 02:27:54 2018 -0500
----------------------------------------------------------------------
.../recipes/cache/PathChildrenCache.java | 29 ++++++++++++++++----
1 file changed, 23 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[4/4] curator git commit: CURATOR-490 testReentrantSingleLock()
should not be run for TestInterProcessSemaphoreMutex as
InterProcessSemaphoreMutex is not re-entrant
Posted by ra...@apache.org.
CURATOR-490 testReentrantSingleLock() should not be run for TestInterProcessSemaphoreMutex as InterProcessSemaphoreMutex is not re-entrant
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/b94844af
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b94844af
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b94844af
Branch: refs/heads/CURATOR-490
Commit: b94844af500054dc6aa1b342e2ea3665de5f232f
Parents: 1731834
Author: randgalt <ra...@apache.org>
Authored: Sun Dec 9 12:28:32 2018 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Dec 9 12:28:32 2018 -0500
----------------------------------------------------------------------
.../recipes/locks/TestInterProcessSemaphoreMutex.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/b94844af/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreMutex.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreMutex.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreMutex.java
index cd8b83e..90bd7da 100644
--- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreMutex.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreMutex.java
@@ -27,13 +27,19 @@ public class TestInterProcessSemaphoreMutex extends TestInterProcessMutexBase
@Override
@Test(enabled = false)
- public void testReentrant() throws Exception
+ public void testReentrant()
{
}
@Override
@Test(enabled = false)
- public void testReentrant2Threads() throws Exception
+ public void testReentrant2Threads()
+ {
+ }
+
+ @Override
+ @Test(enabled = false)
+ public void testReentrantSingleLock()
{
}
[2/4] curator git commit: CURATOR-405
Posted by ra...@apache.org.
CURATOR-405
Once the session expiration is injected, reset startOfSuspendedEpoch so that we don't do this copious times while things are being reset.
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/d9652662
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d9652662
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d9652662
Branch: refs/heads/CURATOR-490
Commit: d9652662293529374c601d90a9700e132a466700
Parents: 2adccc5
Author: randgalt <ra...@apache.org>
Authored: Sun Dec 9 11:11:30 2018 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Dec 9 11:11:30 2018 -0500
----------------------------------------------------------------------
.../org/apache/curator/framework/state/ConnectionStateManager.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/d9652662/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java b/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
index b9384d2..5e28b3d 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
@@ -301,6 +301,7 @@ public class ConnectionStateManager implements Closeable
int useSessionTimeoutMs = getUseSessionTimeoutMs();
if ( elapsedMs >= useSessionTimeoutMs )
{
+ startOfSuspendedEpoch = System.currentTimeMillis(); // reset startOfSuspendedEpoch to avoid spinning on this session expiration injection CURATOR-405
log.warn(String.format("Session timeout has elapsed while SUSPENDED. Injecting a session expiration. Elapsed ms: %d. Adjusted session timeout ms: %d", elapsedMs, useSessionTimeoutMs));
try
{
[3/4] curator git commit: Merge branch 'CURATOR-405' into CURATOR-490
Posted by ra...@apache.org.
Merge branch 'CURATOR-405' into CURATOR-490
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/17318342
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/17318342
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/17318342
Branch: refs/heads/CURATOR-490
Commit: 173183420688875c6e627260ffb4efbbdc48227c
Parents: 4c99357 d965266
Author: randgalt <ra...@apache.org>
Authored: Sun Dec 9 11:13:29 2018 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Dec 9 11:13:29 2018 -0500
----------------------------------------------------------------------
.../org/apache/curator/framework/state/ConnectionStateManager.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------