MID-9162 MID-6607 ninja hangs on some occasions fix. Not very clean, …

…but we're too close to release. Will be followed with another jira to cleanup this code. (cherry picked from commit 67ec500)
Evolveum · Oct 4, 2023 · 0323216 · 0323216
1 parent 242814c
commit 0323216
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/...src/main/java/com/evolveum/midpoint/ninja/action/worker/AbstractWriterConsumerWorker.java b/...src/main/java/com/evolveum/midpoint/ninja/action/worker/AbstractWriterConsumerWorker.java
@@ -36,10 +36,10 @@ public AbstractWriterConsumerWorker(NinjaContext context,
     public void run() {
         Log log = context.getLog();
 
-        init();
-
         Writer writer = null;
         try {
+            init();
+
             writer = createWriter();
 
             while (!shouldConsumerStop()) {
@@ -63,8 +63,12 @@ public void run() {
             finalizeWriter(writer);
         } catch (IOException ex) {
             log.error("Unexpected exception, reason: {}", ex, ex.getMessage());
+
+            operation.finish();
         } catch (NinjaException ex) {
             log.error(ex.getMessage(), ex);
+
+            operation.finish();
         } finally {
             if (options.getOutput() != null) {
                 // we don't want to close stdout, e.g. only if we were writing to file

diff --git a/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportProducerWorker.java b/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportProducerWorker.java
@@ -157,6 +157,10 @@ public EventResult preMarshall(Element objectElement, Node postValidationTree,
             public EventResult postMarshall(
                     T object, Element objectElement, OperationResult objectResult) {
                 try {
+                    if (operation.isFinished()) {
+                        return EventResult.stop("Operation already finished");
+                    }
+
                     if (filter != null) {
                         boolean match = ObjectQuery.match(object, filter, matchingRuleRegistry);
 

diff --git a/...c/main/java/com/evolveum/midpoint/ninja/action/worker/ImportRepositoryConsumerWorker.java b/...c/main/java/com/evolveum/midpoint/ninja/action/worker/ImportRepositoryConsumerWorker.java
@@ -64,6 +64,10 @@ public void run() {
                     operation.incrementError();
                 }
             }
+        } catch (Exception ex) {
+            operation.finish();
+
+            throw ex;
         } finally {
             markDone();
 

diff --git a/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/SearchProducerWorker.java b/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/SearchProducerWorker.java
@@ -56,6 +56,10 @@ public void run() {
 
             ResultHandler<?> handler = (object, parentResult) -> {
                 try {
+                    if (operation.isFinished()) {
+                        return false;
+                    }
+
                     queue.put(object.asObjectable());
                 } catch (InterruptedException ex) {
                     log.error("Couldn't queue object {}, reason: {}", ex, object, ex.getMessage());