You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/07/05 12:19:25 UTC
[tinkerpop] branch master updated (125385e -> 8da09c0)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 125385e Merge branch 'tp34'
new f627cfc Keep-alive was not always properly disabled when configured to zero CTR
new 199da2e Merge branch 'tp33' into tp34
new 8da09c0 Merge branch 'tp34'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 1 +
.../org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
[tinkerpop] 01/03: Keep-alive was not always properly disabled when
configured to zero CTR
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit f627cfc7f0a56362abb6448d2f1c4af0516b4d16
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri Jul 5 08:18:04 2019 -0400
Keep-alive was not always properly disabled when configured to zero CTR
---
CHANGELOG.asciidoc | 1 +
.../org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8cafc12..c2dd5df 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -30,6 +30,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Added test infrastructure to check for storage iterator leak.
* Fixed multiple iterator leaks in query processor.
* Changed default keep-alive time for driver to 3 minutes.
+* Fixed bug where server-side keep-alive was not always disabled when its setting was zero.
* Improved error messaging for invalid inputs to the TinkerGraph `IdManager` instances.
* Forced replacement of connections in Java driver for certain exception types that seem to ultimately kill the connection.
* Changed the `reverse()` of `desc` and `asc` on `Order` to not use the deprecated `decr` and `incr`.
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
index 0f14293..0c6e672 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
@@ -113,7 +113,7 @@ public class OpSelectorHandler extends MessageToMessageDecoder<RequestMessage> {
if (e.state() == IdleState.READER_IDLE) {
logger.info("Closing channel - client is disconnected after idle period of " + settings.idleConnectionTimeout + " " + ctx.channel());
ctx.close();
- } else if (e.state() == IdleState.WRITER_IDLE) {
+ } else if (e.state() == IdleState.WRITER_IDLE && settings.keepAliveInterval > 0) {
logger.info("Checking channel - sending ping to client after idle period of " + settings.keepAliveInterval + " " + ctx.channel());
ctx.writeAndFlush(channelizer.createIdleDetectionMessage());
}
[tinkerpop] 02/03: Merge branch 'tp33' into tp34
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 199da2eb0ba470e3265e4ee70f69d8fa54065c68
Merge: 2a337c6 f627cfc
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri Jul 5 08:19:06 2019 -0400
Merge branch 'tp33' into tp34
CHANGELOG.asciidoc | 1 +
.../org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 8da09c0435623421855d8596e54256368f84c3e5
Merge: 125385e 199da2e
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri Jul 5 08:19:12 2019 -0400
Merge branch 'tp34'
CHANGELOG.asciidoc | 1 +
.../org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)