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/11/13 15:35:05 UTC
[tinkerpop] branch travis-fix updated (2cc43d8 -> f9327f6)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch travis-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
discard 2cc43d8 test if waiting helps close connections
discard 21279d7 Make the first request in a synchronous fashion
discard fd9ecd4 Cleanup travis logs a bit by increasing compilation time.
discard 8d9db39 Prevent a null pointer when session kill futuer is not present CTR
add 2d0e9e0 Some minor LICENSE/NOTICE cleanup that was missed at some point CTR
add 6c7df78 Reduce the number of warmup rounds in benchmarks
add f49c96e Merge branch 'tp33' into tp34
add b5b48a4 Reverts TINKERPOP-2289 resolve ip address
add 25e5087 Merge remote-tracking branch 'origin/revert_tinkerpop-2289' into tp33
add f831fd1 Merge branch 'tp33' into tp34
add 3410bb0 Bump to gmavenplus plugin 1.8.1 CTR
add bc9158c Merge branch 'tp33' into tp34
new 9aa0692 Prevent a null pointer when session kill futuer is not present CTR
new 91e8db2 Cleanup travis logs a bit by increasing compilation time.
new aa6d5cf Make the first request in a synchronous fashion
new f9327f6 test if waiting helps close connections
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2cc43d8)
\
N -- N -- N refs/heads/travis-fix (f9327f6)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 4 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 +
gremlin-console/src/main/static/LICENSE | 2 +-
gremlin-console/src/main/static/NOTICE | 12 ++++++
gremlin-driver/pom.xml | 18 ---------
.../apache/tinkerpop/gremlin/driver/Cluster.java | 24 ++++-------
.../org/apache/tinkerpop/gremlin/driver/Host.java | 3 +-
.../apache/tinkerpop/gremlin/driver/HostTest.java | 46 +---------------------
gremlin-server/src/main/static/LICENSE | 2 +-
gremlin-server/src/main/static/NOTICE | 12 ++++++
.../benchmark/util/AbstractBenchmarkBase.java | 2 +-
pom.xml | 1 +
11 files changed, 39 insertions(+), 84 deletions(-)
[tinkerpop] 01/04: Prevent a null pointer when session kill futuer
is not present CTR
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch travis-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 9aa06921722bd5b004c7f3a946b5dd19146bb5c1
Author: stephen <sp...@gmail.com>
AuthorDate: Mon Nov 11 08:23:31 2019 -0500
Prevent a null pointer when session kill futuer is not present CTR
---
.../org/apache/tinkerpop/gremlin/server/op/session/Session.java | 8 +++++++-
.../tinkerpop/gremlin/server/op/session/SessionOpProcessor.java | 1 -
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
index f41a0fb..7191d04 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
@@ -34,6 +34,7 @@ import javax.script.Bindings;
import javax.script.SimpleBindings;
import java.util.HashMap;
import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -155,7 +156,12 @@ public class Session {
* session kill will mean.
*/
public void manualKill(final boolean force) {
- kill.get().cancel(true);
+ // seems there is a situation where kill can get nulled. seems to only happen in travis as a result of test
+ // runs and i'm guessing it has something to do with a combination of shutdown and session close though i'm
+ // not sure why. perhaps this "fix" just masks up a deeper problem but as i reason on it now, it seems mostly
+ // bound to shutdown situations which basically means the forced end of the session anyway, so perhaps the
+ // root cause isn't something that needs immediate chasing (at least until it can be shown otherwise anyway)
+ Optional.ofNullable(kill.get()).ifPresent(f -> f.cancel(true));
kill(force);
}
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java
index 54a409b..545ae7e 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java
@@ -124,7 +124,6 @@ public class SessionOpProcessor extends AbstractEvalOpProcessor {
/**
* Session based requests accept a "close" operator in addition to "eval". A close will trigger the session to be
* killed and any uncommitted transaction to be rolled-back.
- * @return
*/
@Override
public Optional<ThrowingConsumer<Context>> selectOther(final RequestMessage requestMessage) throws OpProcessorException {
[tinkerpop] 03/04: Make the first request in a synchronous fashion
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch travis-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit aa6d5cf660797a543e7279bc5462ad9c525e9191
Author: stephen <sp...@gmail.com>
AuthorDate: Mon Nov 11 20:17:02 2019 -0500
Make the first request in a synchronous fashion
---
.../tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
index 07944e8..4273634 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
@@ -330,7 +330,7 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInt
final Cluster cluster = TestClientFactory.build().minInProcessPerConnection(16).maxInProcessPerConnection(64).create();
final Client client = cluster.connect(name.getMethodName());
- client.submitAsync("a=100;b=1000;c=10000;null");
+ client.submit("a=100;b=1000;c=10000;null").all().get();
final int requests = 10000;
final List<CompletableFuture<ResultSet>> futures = new ArrayList<>(requests);
IntStream.range(0, requests).forEach(i -> {
[tinkerpop] 04/04: test if waiting helps close connections
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch travis-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit f9327f6dbd9e3081830558dfa797b944513b4425
Author: Robert Dale <ro...@gmail.com>
AuthorDate: Wed Nov 13 08:12:02 2019 -0500
test if waiting helps close connections
---
.../tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
index 4273634..75b4586 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
@@ -352,7 +352,13 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInt
assertEquals(requests, counter);
+ System.out.println("shouldEnsureSessionBindingsAreThreadSafe: calling cluster.close");
cluster.close();
+ System.out.println("shouldEnsureSessionBindingsAreThreadSafe: called cluster.close");
+ System.out.println("shouldEnsureSessionBindingsAreThreadSafe: waiting");
+ Thread.sleep(120000);
+ System.out.println("shouldEnsureSessionBindingsAreThreadSafe: done waiting, exiting test");
+
}
@Test
[tinkerpop] 02/04: Cleanup travis logs a bit by increasing
compilation time.
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch travis-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 91e8db2ab9146f4fa51e89a7ead2a1437911cfad
Author: stephen <sp...@gmail.com>
AuthorDate: Mon Nov 11 19:54:47 2019 -0500
Cleanup travis logs a bit by increasing compilation time.
Noticed the logs were filled with WARN messages about init scripts taking longer than the default time of 5 seconds to compile. Must just be slower on Travis as we don't see this elsewhere.
---
docker/gremlin-server/gremlin-server-integration-secure.yaml | 1 +
docker/gremlin-server/gremlin-server-integration.yaml | 1 +
.../org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml | 1 +
3 files changed, 3 insertions(+)
diff --git a/docker/gremlin-server/gremlin-server-integration-secure.yaml b/docker/gremlin-server/gremlin-server-integration-secure.yaml
index 2274852..c489e07 100644
--- a/docker/gremlin-server/gremlin-server-integration-secure.yaml
+++ b/docker/gremlin-server/gremlin-server-integration-secure.yaml
@@ -29,6 +29,7 @@ scriptEngines: {
gremlin-groovy: {
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin: {expectedCompilationTime: 30000},
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}},
gremlin-jython: {},
diff --git a/docker/gremlin-server/gremlin-server-integration.yaml b/docker/gremlin-server/gremlin-server-integration.yaml
index 4ccaf32..7c5445a 100644
--- a/docker/gremlin-server/gremlin-server-integration.yaml
+++ b/docker/gremlin-server/gremlin-server-integration.yaml
@@ -29,6 +29,7 @@ scriptEngines: {
gremlin-groovy: {
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin: {expectedCompilationTime: 30000},
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}},
gremlin-jython: {},
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
index adf05cd..601e404 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
@@ -42,6 +42,7 @@ scriptEngines: {
gremlin-groovy: {
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin: {expectedCompilationTime: 30000},
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
serializers: