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 2016/04/17 12:45:44 UTC

incubator-tinkerpop git commit: TINKERPOP-1265 Managed tx on session was not rolling back on eval exception.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/tp31 b0345d70b -> 44b1af8f7


TINKERPOP-1265 Managed tx on session was not rolling back on eval exception.

This was a pretty minor fix that just involved overriding default behavior of the GremlinExecutor LifeCycle afterFailure() to do a managed transaction rollback. CTR


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/44b1af8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/44b1af8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/44b1af8f

Branch: refs/heads/tp31
Commit: 44b1af8f7cbe2afabd800bcb2620b73c031c6bb8
Parents: b0345d7
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sun Apr 17 06:43:05 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sun Apr 17 06:43:05 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../server/op/AbstractEvalOpProcessor.java      | 29 ++++++++++++++------
 .../server/GremlinDriverIntegrateTest.java      |  2 +-
 .../GremlinServerSessionIntegrateTest.java      | 21 ++++++++++++++
 4 files changed, 44 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/44b1af8f/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index c7165bd..9e117e1 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
 TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* Fixed bug where transaction managed sessions were not properly rolling back transactions for exceptions encountered during script evaluation.
 * Fixed bug in `:uninstall` command if the default `/ext` directory was not used.
 
 [[release-3-1-2-incubating]]

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/44b1af8f/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
index 08c92c2..a5dd0a0 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
@@ -201,6 +201,9 @@ public abstract class AbstractEvalOpProcessor implements OpProcessor {
 
         final GremlinExecutor.LifeCycle lifeCycle = GremlinExecutor.LifeCycle.build()
                 .scriptEvaluationTimeoutOverride(seto)
+                .afterFailure((b,t) -> {
+                    if (managedTransactionsForRequest) attemptRollback(msg, context.getGraphManager(), settings.strictTransactionManagement);
+                })
                 .beforeEval(b -> {
                     try {
                         b.putAll(bindingsSupplier.get());
@@ -417,12 +420,17 @@ public abstract class AbstractEvalOpProcessor implements OpProcessor {
 
     private static void attemptCommit(final RequestMessage msg, final GraphManager graphManager, final boolean strict) {
         if (strict) {
-            // assumes that validations will already have been performed in extending classes - they are performed
-            // in StandardOpProcessor when getting bindings right now
+            // validations should have already been performed in StandardOpProcessor, but a failure in bindings maker
+            // at the time of the eval might raise through here at which point the validation didn't yet happen. better
+            // to just check again
             final boolean hasRebindings = msg.getArgs().containsKey(Tokens.ARGS_REBINDINGS);
             final String rebindingOrAliasParameter = hasRebindings ? Tokens.ARGS_REBINDINGS : Tokens.ARGS_ALIASES;
-            final Map<String, String> aliases = (Map<String, String>) msg.getArgs().get(rebindingOrAliasParameter);
-            graphManager.commit(new HashSet<>(aliases.values()));
+            if (msg.getArgs().containsKey(rebindingOrAliasParameter)) {
+                final Map<String, String> aliases = (Map<String, String>) msg.getArgs().get(rebindingOrAliasParameter);
+                graphManager.commit(new HashSet<>(aliases.values()));
+            } else {
+                graphManager.commitAll();
+            }
         } else {
             graphManager.commitAll();
         }
@@ -430,12 +438,17 @@ public abstract class AbstractEvalOpProcessor implements OpProcessor {
 
     private static void attemptRollback(final RequestMessage msg, final GraphManager graphManager, final boolean strict) {
         if (strict) {
-            // assumes that validations will already have been performed in extending classes - they are performed
-            // in StandardOpProcessor when getting bindings right now
+            // validations should have already been performed in StandardOpProcessor, but a failure in bindings maker
+            // at the time of the eval might raise through here at which point the validation didn't yet happen. better
+            // to just check again
             final boolean hasRebindings = msg.getArgs().containsKey(Tokens.ARGS_REBINDINGS);
             final String rebindingOrAliasParameter = hasRebindings ? Tokens.ARGS_REBINDINGS : Tokens.ARGS_ALIASES;
-            final Map<String, String> aliases = (Map<String, String>) msg.getArgs().get(rebindingOrAliasParameter);
-            graphManager.rollback(new HashSet<>(aliases.values()));
+            if (msg.getArgs().containsKey(rebindingOrAliasParameter)) {
+                final Map<String, String> aliases = (Map<String, String>) msg.getArgs().get(rebindingOrAliasParameter);
+                graphManager.rollback(new HashSet<>(aliases.values()));
+            } else {
+                graphManager.rollbackAll();
+            }
         } else {
             graphManager.rollbackAll();
         }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/44b1af8f/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
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 6912545..4f6a655 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
@@ -980,7 +980,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
         final Client client = cluster.connect();
 
         try {
-            client.submit("1+1").all().get().get(0).getVertex();
+            client.submit("1+1").all().get();
             fail("Should have tossed an exception because strict mode is on and no aliasing was performed");
         } catch (Exception ex) {
             final Throwable root = ExceptionUtils.getRootCause(ex);

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/44b1af8f/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
----------------------------------------------------------------------
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 70d9e97..56336fa 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
@@ -97,6 +97,7 @@ public class GremlinServerSessionIntegrateTest  extends AbstractGremlinServerInt
                 break;
             case "shouldExecuteInSessionAndSessionlessWithoutOpeningTransactionWithSingleClient":
             case "shouldExecuteInSessionWithTransactionManagement":
+            case "shouldRollbackOnEvalExceptionForManagedTransaction":
                 deleteDirectory(new File("/tmp/neo4j"));
                 settings.graphs.put("graph", "conf/neo4j-empty.properties");
                 break;
@@ -106,6 +107,26 @@ public class GremlinServerSessionIntegrateTest  extends AbstractGremlinServerInt
     }
 
     @Test
+    public void shouldRollbackOnEvalExceptionForManagedTransaction() throws Exception {
+        final Cluster cluster = Cluster.build().create();
+        final Client client = cluster.connect(name.getMethodName(), true);
+
+        try {
+            client.submit("graph.addVertex(); throw new Exception('no worky')").all().get();
+            fail("Should have tossed the manually generated exception");
+        } catch (Exception ex) {
+            final Throwable root = ExceptionUtils.getRootCause(ex);
+            assertEquals("no worky", root.getMessage());
+
+            // just force a commit here of "something" in case there is something lingering
+            client.submit("graph.addVertex(); graph.tx().commit()").all().get();
+        }
+
+        // the transaction is managed so a rollback should have executed
+        assertEquals(1, client.submit("g.V().count()").all().get().get(0).getInt());
+    }
+
+    @Test
     public void shouldCloseSessionOnceOnRequest() throws Exception {
         final Cluster cluster = Cluster.build().create();
         final Client client = cluster.connect(name.getMethodName());