(nifi) branch main updated: NIFI-13883 [MiNiFI][C2] Fix MiNiFI recovery if exception happens on config update

[briansolo1985]

This is an automated email from the ASF dual-hosted git repository.

briansolo1985 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new 94d0ee9460 NIFI-13883 [MiNiFI][C2] Fix MiNiFI recovery if exception 
happens on config update
94d0ee9460 is described below

commit 94d0ee9460f9f56328a2e6b15b3d9b74d6c3d258
Author: Ferenc Erdei <erdei.feren...@gmail.com>
AuthorDate: Thu Oct 17 09:30:28 2024 +0200

    NIFI-13883 [MiNiFI][C2] Fix MiNiFI recovery if exception happens on config 
update
    
    Signed-off-by: Ferenc Kis <briansolo1...@gmail.com>
    
    This closes #9402.
---
 .../src/main/java/org/apache/nifi/minifi/validator/FlowValidator.java    | 1 -
 .../minifi-runtime/src/main/java/org/apache/nifi/minifi/MiNiFi.java      | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/main/java/org/apache/nifi/minifi/validator/FlowValidator.java
 
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/main/java/org/apache/nifi/minifi/validator/FlowValidator.java
index 5e154f1f9e..cabf7e4bdd 100644
--- 
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/main/java/org/apache/nifi/minifi/validator/FlowValidator.java
+++ 
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/main/java/org/apache/nifi/minifi/validator/FlowValidator.java
@@ -104,7 +104,6 @@ public final class FlowValidator {
         )
         .ifPresent(controllerServices -> {
             LOGGER.error("The following controller services are still in 
ENABLING state: {}", controllerServices);
-            throw new IllegalStateException("Maximum retry number exceeded 
while waiting for controller service to be validated");
         });
     }
 
diff --git 
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/main/java/org/apache/nifi/minifi/MiNiFi.java
 
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/main/java/org/apache/nifi/minifi/MiNiFi.java
index c35957709f..95aad67a18 100644
--- 
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/main/java/org/apache/nifi/minifi/MiNiFi.java
+++ 
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/main/java/org/apache/nifi/minifi/MiNiFi.java
@@ -226,6 +226,7 @@ public class MiNiFi {
             new MiNiFi(properties);
         } catch (final Throwable t) {
             logger.error("Failure to launch MiNiFi", t);
+            System.exit(1);
         }
     }