fix not rollback if commitPartOfEdgeDeletions() fails (apache#1513)

Change-Id: Ic7b03c25fc00605980d461245b5d3c4b911a7d86
jadepeng · Jun 24, 2021 · b43ab45 · b43ab45
1 parent ab69c8b
commit b43ab45
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/AbstractTransaction.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/AbstractTransaction.java
@@ -231,8 +231,7 @@ public void rollback() throws BackendException {
         LOG.debug("Transaction rollback()...");
         this.reset();
         if (this.committing2Backend) {
-            this.committing2Backend = false;
-            this.store.rollbackTx();
+            this.rollbackBackend();
         }
     }
 
@@ -301,6 +300,11 @@ protected void commitMutation2Backend(BackendMutation... mutations) {
         this.committing2Backend = false;
     }
 
+    protected void rollbackBackend() {
+        this.committing2Backend = false;
+        this.store.rollbackTx();
+    }
+
     protected BackendMutation prepareCommit() {
         // For sub-class preparing data, nothing to do here
         LOG.debug("Transaction prepareCommit()...");

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphTransaction.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphTransaction.java
@@ -75,7 +75,6 @@
 import com.baidu.hugegraph.iterator.LimitIterator;
 import com.baidu.hugegraph.iterator.ListIterator;
 import com.baidu.hugegraph.iterator.MapperIterator;
-import com.baidu.hugegraph.iterator.WrappedIterator;
 import com.baidu.hugegraph.job.system.DeleteExpiredJob;
 import com.baidu.hugegraph.perf.PerfUtil.Watched;
 import com.baidu.hugegraph.schema.EdgeLabel;
@@ -483,6 +482,8 @@ private void commitPartOfEdgeDeletions(Map<Id, HugeEdge> removedEdges) {
 
         try {
             this.commitMutation2Backend(mutation, idxMutation);
+        } catch (Throwable e) {
+            this.rollbackBackend();
         } finally {
             mutation.clear();
             idxMutation.clear();