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 2024/06/19 11:24:02 UTC
(tinkerpop) branch master updated (bb4fccdb3a -> 9bddde4be3)
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 bb4fccdb3a CTR add CHANGELOG entry for PR #2599
new a37e93f3c3 Improved error messaging for NHA
new dc6e715775 Merge branch '3.6-dev' into 3.7-dev
new 9bddde4be3 Merge branch '3.7-dev'
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 +
.../src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
(tinkerpop) 03/03: Merge branch '3.7-dev'
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 9bddde4be3be4734f47ab3993c98eaebf2840c98
Merge: bb4fccdb3a dc6e715775
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Jun 19 07:23:51 2024 -0400
Merge branch '3.7-dev'
CHANGELOG.asciidoc | 1 +
.../src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
(tinkerpop) 02/03: Merge branch '3.6-dev' into 3.7-dev
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 dc6e715775710b56c75613e145bf591aa6ecbc19
Merge: edec67ff15 a37e93f3c3
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Jun 19 07:23:41 2024 -0400
Merge branch '3.6-dev' into 3.7-dev
CHANGELOG.asciidoc | 1 +
.../src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --cc gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index 7ce5c404d3,fe5d3275fb..b53f1cddbb
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@@ -18,13 -18,11 +18,14 @@@
*/
package org.apache.tinkerpop.gremlin.driver;
+ import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakeException;
import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
(tinkerpop) 01/03: Improved error messaging for NHA
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 a37e93f3c3b3c1b404c34ecf77ac05a0d959e046
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Jun 19 07:10:05 2024 -0400
Improved error messaging for NHA
Added another exception type to those than can be raised as a cause of NHA CTR
---
CHANGELOG.asciidoc | 1 +
.../src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 9ed48ba553..67051055cd 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -24,6 +24,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
=== TinkerPop 3.6.8 (NOT OFFICIALLY RELEASED YET)
* Fixed bug in Java driver where connection pool was not removing dead connections under certain error conditions.
+* Raised handshake exceptions for Java driver for `NoHostAvailableException` situations.
[[release-3-6-7]]
=== TinkerPop 3.6.7 (April 8, 2024)
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index 415edde664..fe5d3275fb 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.driver;
+import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakeException;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
@@ -555,7 +556,8 @@ public abstract class Client {
private void throwNoHostAvailableException() {
final Throwable rootCause = ExceptionUtils.getRootCause(initializationFailure);
// allow the certain exceptions to propagate as a cause
- if (rootCause instanceof SSLException || rootCause instanceof ConnectException) {
+ if (rootCause instanceof SSLException || rootCause instanceof ConnectException ||
+ rootCause instanceof WebSocketClientHandshakeException) {
throw new NoHostAvailableException(initializationFailure);
} else {
throw new NoHostAvailableException();