Merge pull request #7299 from FlorentinD/check-shutdown-was-called-before

Make restart more fail-safe

Author: FlorentinD

io/core/src/main/java/org/neo4j/gds/core/io/file/FileToGraphStoreImporter.java

@@ -97,13 +97,19 @@ protected FileToGraphStoreImporter(
     public UserGraphStore run() {
         var fileInput = fileInput(importPath);
         this.progressTracker = createProgressTracker(fileInput);
-        progressTracker.beginSubTask();
+
         try {
+            progressTracker.beginSubTask();
             importGraphStore(fileInput);
             graphStoreBuilder.schema(graphSchemaBuilder.build());
-            return ImmutableUserGraphStore.of(fileInput.userName(), graphStoreBuilder.build());
-        } finally {
+            var userGraphStore = ImmutableUserGraphStore.of(fileInput.userName(), graphStoreBuilder.build());
             progressTracker.endSubTask();
+
+            return userGraphStore;
+        } catch (Exception e) {
+            progressTracker.endSubTaskWithFailure();
+
+            throw e;
         }
     }