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 22:06:22 UTC
[1/2] curator git commit: CURATOR-405
Repository: curator
Updated Branches:
refs/heads/master 05f6a5673 -> 771e9a4cd
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/master
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
{
[2/2] curator git commit: Merge branch 'CURATOR-405'
Posted by ra...@apache.org.
Merge branch 'CURATOR-405'
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/771e9a4c
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/771e9a4c
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/771e9a4c
Branch: refs/heads/master
Commit: 771e9a4cde4f8af913db934db01b93460ac97ebc
Parents: 05f6a56 d965266
Author: randgalt <ra...@apache.org>
Authored: Sun Dec 9 17:06:14 2018 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Dec 9 17:06:14 2018 -0500
----------------------------------------------------------------------
.../org/apache/curator/framework/state/ConnectionStateManager.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------