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 2021/04/01 17:59:38 UTC
[tinkerpop] branch travis-fix updated (b0e8b41 -> 85d6dac)
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 b0e8b41 Ignored shouldEventuallySucceedOnSameServerWithDefault
add 14a3052 Ignored shouldEventuallySucceedOnSameServerWithDefault
add f8c91fc Closing the alias needs to close the underlying client with it
new d93fddb TINKERPOP-2245 Changed logging for sessions
new 85d6dac Added some logging to try to isolate what travis is failing on.
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 (b0e8b41)
\
N -- N -- N refs/heads/travis-fix (85d6dac)
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 2 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:
.travis.yml | 2 +-
CHANGELOG.asciidoc | 3 +-
.../apache/tinkerpop/gremlin/driver/Client.java | 16 +++++-----
.../gremlin/server/handler/MultiRexster.java | 2 +-
.../gremlin/server/op/session/Session.java | 8 ++---
.../gremlin/server/GremlinDriverIntegrateTest.java | 13 +++++---
.../server/GremlinServerSessionIntegrateTest.java | 19 +++++++-----
.../server/GremlinSessionTxIntegrateTest.java | 36 +++++++++++++++++++++-
8 files changed, 70 insertions(+), 29 deletions(-)
[tinkerpop] 02/02: Added some logging to try to isolate what travis
is failing on.
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 85d6dacb5c7d70930a907f245185e42f88b5a175
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Apr 1 13:58:49 2021 -0400
Added some logging to try to isolate what travis is failing on.
---
.travis.yml | 2 +-
.../apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index ff3a058..fd1b51c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,7 +68,7 @@ jobs:
name: "gremlin console"
- script:
- "mvn clean install -q -DskipTests -Dci"
- - "travis_wait 60 mvn verify -pl :spark-gremlin -DskipTests -DskipIntegrationTests=false '-Dit.test=*IntegrateTest,!SparkGryoSerializerGraphComputerProcessIntegrateTest'"
+ - "mvn verify -pl :spark-gremlin -DskipTests -DskipIntegrationTests=false '-Dit.test=*IntegrateTest,!SparkGryoSerializerGraphComputerProcessIntegrateTest'"
name: "spark - core"
- script:
- "mvn clean install -q -DskipTests -Dci"
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 7e09c95..93731c0 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -115,6 +115,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Before
public void setupForEachTest() {
+ logger.info("STARTING: " + name.getMethodName());
recordingAppender = new Log4jRecordingAppender();
final org.apache.log4j.Logger rootLogger = org.apache.log4j.Logger.getRootLogger();
@@ -146,6 +147,8 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
}
rootLogger.removeAppender(recordingAppender);
+
+ logger.info("STOPPING: " + name.getMethodName());
}
/**
[tinkerpop] 01/02: TINKERPOP-2245 Changed logging for sessions
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 d93fddbd7e1b7e2768a7c725a3ff23cfaf8b471c
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Apr 1 13:44:48 2021 -0400
TINKERPOP-2245 Changed logging for sessions
With remote transactions there will be many more sessions created/destroyed. It would be excessive to log them all - changed to debug level.
---
.../gremlin/server/handler/MultiRexster.java | 2 +-
.../tinkerpop/gremlin/server/op/session/Session.java | 8 ++++----
.../server/GremlinServerSessionIntegrateTest.java | 19 +++++++++++--------
.../gremlin/server/GremlinSessionTxIntegrateTest.java | 5 +++--
4 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/MultiRexster.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/MultiRexster.java
index a54b905..ceba2a2 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/MultiRexster.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/MultiRexster.java
@@ -178,7 +178,7 @@ public class MultiRexster extends AbstractRexster {
ending.set(true);
cancelRequestTimeout();
super.close();
- logger.info("Session {} closed", getSessionId());
+ logger.debug("Session {} closed", getSessionId());
}
private void cancelRequestTimeout() {
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 8d4fe3f..f7934d5 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
@@ -93,7 +93,7 @@ public class Session {
private final ConcurrentHashMap<String, Session> sessions;
public Session(final String session, final Context context, final ConcurrentHashMap<String, Session> sessions) {
- logger.info("New session established for {}", session);
+ logger.debug("New session established for {}", session);
this.session = session;
this.bindings = new SimpleBindings();
this.settings = context.getSettings();
@@ -201,7 +201,7 @@ public class Session {
try {
executor.submit(() -> {
if (g.tx().isOpen()) {
- logger.info("Rolling back open transactions on {} before killing session: {}", gName, session);
+ logger.debug("Rolling back open transactions on {} before killing session: {}", gName, session);
g.tx().rollback();
}
}).get(configuredPerGraphCloseTimeout, TimeUnit.MILLISECONDS);
@@ -211,7 +211,7 @@ public class Session {
}
});
} else {
- logger.info("Skipped attempt to close open graph transactions on {} - close was forced", session);
+ logger.debug("Skipped attempt to close open graph transactions on {} - close was forced", session);
}
// prevent any additional requests from processing. if the kill was not "forced" then jobs were scheduled to
@@ -225,7 +225,7 @@ public class Session {
// once a session is dead release the gauges in the registry for it
MetricManager.INSTANCE.getRegistry().removeMatching((s, metric) -> s.contains(session));
- logger.info("Session {} closed", session);
+ logger.debug("Session {} closed", session);
}
private GremlinExecutor.Builder initializeGremlinExecutor() {
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 6d07558..28adc61 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
@@ -33,6 +33,8 @@ import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
import org.apache.tinkerpop.gremlin.server.channel.UnifiedChannelizer;
+import org.apache.tinkerpop.gremlin.server.handler.OpSelectorHandler;
+import org.apache.tinkerpop.gremlin.server.op.session.Session;
import org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor;
import org.apache.tinkerpop.gremlin.util.Log4jRecordingAppender;
import org.junit.After;
@@ -74,7 +76,8 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInte
case "shouldCloseSessionOnceOnRequest":
case "shouldHaveTheSessionTimeout":
case "shouldCloseSessionOnClientClose":
- Logger.getRootLogger().setLevel(Level.INFO);
+ final org.apache.log4j.Logger sessionLogger = org.apache.log4j.Logger.getLogger(Session.class);
+ sessionLogger.setLevel(Level.DEBUG);
break;
}
rootLogger.addAppender(recordingAppender);
@@ -82,9 +85,9 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInte
@After
public void teardownForEachTest() {
- final Logger rootLogger = Logger.getRootLogger();
- rootLogger.setLevel(originalLevel);
- rootLogger.removeAppender(recordingAppender);
+ final org.apache.log4j.Logger sessionLogger = org.apache.log4j.Logger.getLogger(Session.class);
+ sessionLogger.setLevel(originalLevel);
+ sessionLogger.removeAppender(recordingAppender);
}
/**
@@ -167,8 +170,8 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInte
if (isUsingUnifiedChannelizer()) {
assertThat(((UnifiedChannelizer) server.getChannelizer()).getUnifiedHandler().isActiveSession(name.getMethodName()), is(false));
} else {
- assertThat(recordingAppender.getMessages(), hasItem("INFO - Skipped attempt to close open graph transactions on shouldCloseSessionOnClientClose - close was forced\n"));
- assertThat(recordingAppender.getMessages(), hasItem("INFO - Session shouldCloseSessionOnClientClose closed\n"));
+ assertThat(recordingAppender.getMessages(), hasItem("DEBUG - Skipped attempt to close open graph transactions on shouldCloseSessionOnClientClose - close was forced\n"));
+ assertThat(recordingAppender.getMessages(), hasItem("DEBUG - Session shouldCloseSessionOnClientClose closed\n"));
}
// try to reconnect to that session and make sure no state is there
@@ -369,7 +372,7 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInte
assertThat(((UnifiedChannelizer) server.getChannelizer()).getUnifiedHandler().isActiveSession(name.getMethodName()), is(false));
} else {
assertEquals(1, recordingAppender.getMessages().stream()
- .filter(msg -> msg.equals("INFO - Session shouldCloseSessionOnceOnRequest closed\n")).count());
+ .filter(msg -> msg.equals("DEBUG - Session shouldCloseSessionOnceOnRequest closed\n")).count());
}
}
@@ -409,7 +412,7 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInte
} else {
// there will be one for the timeout and a second for closing the cluster
assertEquals(2, recordingAppender.getMessages().stream()
- .filter(msg -> msg.equals("INFO - Session shouldHaveTheSessionTimeout closed\n")).count());
+ .filter(msg -> msg.equals("DEBUG - Session shouldHaveTheSessionTimeout closed\n")).count());
}
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionTxIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionTxIntegrateTest.java
index 534f867..89784f9 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionTxIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionTxIntegrateTest.java
@@ -214,8 +214,9 @@ public class GremlinSessionTxIntegrateTest extends AbstractGremlinServerIntegrat
final Cluster cluster = TestClientFactory.build().create();
final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
- // need to open significantly more sessions that we have threads in gremlinPool
- final int numberOfSessions = 500;
+ // need to open significantly more sessions that we have threads in gremlinPool. if we go too obscene on
+ // OpProcessor this test will take too long
+ final int numberOfSessions = isUsingUnifiedChannelizer() ? 1000 : 100;
for (int ix = 0; ix < numberOfSessions; ix ++) {
final Transaction tx = g.tx();
final GraphTraversalSource gtx = tx.begin();