Merge pull request #8939 from neo-technology/close-task-cypher-projection

Fix Cypher Projection progress tracking bug

Author: jjaderberg

legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherFactory.java

@@ -163,40 +163,45 @@ public GraphDimensions estimationDimensions() {
     public CSRGraphStore build() {
         // Temporarily override the security context to enforce read-only access during load
         return readOnlyTransaction().apply((tx, ktx) -> {
-            BatchLoadResult nodeCount = new CountingCypherRecordLoader(
-                cypherConfig.nodeQuery(),
-                CypherRecordLoader.QueryType.NODE,
-                cypherConfig,
-                loadingContext
-            ).load(ktx.internalTransaction());
-
-            progressTracker.beginSubTask("Loading");
-            var nodes = new CypherNodeLoader(
-                cypherConfig.nodeQuery(),
-                nodeCount.rows(),
-                cypherConfig,
-                loadingContext,
-                progressTracker
-            ).load(ktx.internalTransaction());
-
-            var relationshipImportResult = new CypherRelationshipLoader(
-                cypherConfig.relationshipQuery(),
-                nodes.idMap(),
-                cypherConfig,
-                loadingContext,
-                progressTracker
-            ).load(ktx.internalTransaction());
-
-            var graphStore = createGraphStore(
-                nodes,
-                relationshipImportResult
-            );
-
-            progressTracker.endSubTask("Loading");
-
-            logLoadingSummary(graphStore);
-
-            return graphStore;
+            try {
+                progressTracker.beginSubTask("Loading");
+                BatchLoadResult nodeCount = new CountingCypherRecordLoader(
+                    cypherConfig.nodeQuery(),
+                    CypherRecordLoader.QueryType.NODE,
+                    cypherConfig,
+                    loadingContext
+                ).load(ktx.internalTransaction());
+
+                var nodes = new CypherNodeLoader(
+                    cypherConfig.nodeQuery(),
+                    nodeCount.rows(),
+                    cypherConfig,
+                    loadingContext,
+                    progressTracker
+                ).load(ktx.internalTransaction());
+
+                var relationshipImportResult = new CypherRelationshipLoader(
+                    cypherConfig.relationshipQuery(),
+                    nodes.idMap(),
+                    cypherConfig,
+                    loadingContext,
+                    progressTracker
+                ).load(ktx.internalTransaction());
+
+                var graphStore = createGraphStore(
+                    nodes,
+                    relationshipImportResult
+                );
+
+                progressTracker.endSubTask("Loading");
+
+                logLoadingSummary(graphStore);
+
+                return graphStore;
+            } catch (RuntimeException ex) {
+                progressTracker.endSubTaskWithFailure();
+                throw ex;
+            }
         });
     }