You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by be...@apache.org on 2023/11/08 17:22:11 UTC

(nifi) branch main updated: NIFI-12335 Fix MiNiFi startup issue

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

bejancsaba 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 4430effe00 NIFI-12335 Fix MiNiFi startup issue
4430effe00 is described below

commit 4430effe00136321e686e866f8d08f93e577a2e0
Author: Ferenc Erdei <er...@gmail.com>
AuthorDate: Wed Nov 8 15:18:40 2023 +0100

    NIFI-12335 Fix MiNiFi startup issue
    
    Signed-off-by: Csaba Bejan <be...@gmail.com>
    
    This closes #7998.
---
 .../minifi/commons/service/FlowEnrichService.java  | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/minifi/minifi-commons/minifi-commons-framework/src/main/java/org/apache/nifi/minifi/commons/service/FlowEnrichService.java b/minifi/minifi-commons/minifi-commons-framework/src/main/java/org/apache/nifi/minifi/commons/service/FlowEnrichService.java
index 3fd5e06474..0f7b03d1e8 100644
--- a/minifi/minifi-commons/minifi-commons-framework/src/main/java/org/apache/nifi/minifi/commons/service/FlowEnrichService.java
+++ b/minifi/minifi-commons/minifi-commons-framework/src/main/java/org/apache/nifi/minifi/commons/service/FlowEnrichService.java
@@ -26,6 +26,7 @@ import static java.util.Optional.ofNullable;
 import static java.util.UUID.randomUUID;
 import static java.util.stream.Collectors.toMap;
 import static org.apache.commons.lang3.StringUtils.EMPTY;
+import static org.apache.nifi.flow.ScheduledState.ENABLED;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonFactory;
@@ -90,6 +91,9 @@ public class FlowEnrichService {
         }
 
         VersionedDataflow versionedDataflow = parseVersionedDataflow(flowCandidate);
+        versionedDataflow.setReportingTasks(ofNullable(versionedDataflow.getReportingTasks()).orElseGet(ArrayList::new));
+        versionedDataflow.setRegistries(ofNullable(versionedDataflow.getRegistries()).orElseGet(ArrayList::new));
+        versionedDataflow.setControllerServices(ofNullable(versionedDataflow.getControllerServices()).orElseGet(ArrayList::new));
 
         Optional<Integer> maxConcurrentThreads = ofNullable(minifiProperties.getProperty(MiNiFiProperties.NIFI_MINIFI_FLOW_MAX_CONCURRENT_THREADS.getKey()))
             .map(Integer::parseInt);
@@ -103,13 +107,10 @@ public class FlowEnrichService {
             rootGroup.setInstanceIdentifier(randomUUID().toString());
         }
 
+        rootGroup.getControllerServices().forEach(controllerService -> controllerService.setScheduledState(ENABLED));
+
         Optional<VersionedControllerService> commonSslControllerService = createCommonSslControllerService();
-        commonSslControllerService
-            .ifPresent(sslControllerService -> {
-                List<VersionedControllerService> currentControllerServices = ofNullable(versionedDataflow.getControllerServices()).orElseGet(ArrayList::new);
-                currentControllerServices.add(sslControllerService);
-                versionedDataflow.setControllerServices(currentControllerServices);
-            });
+        commonSslControllerService.ifPresent(versionedDataflow.getControllerServices()::add);
 
         commonSslControllerService
             .filter(__ -> parseBoolean(minifiProperties.getProperty(MiNiFiProperties.NIFI_MINIFI_FLOW_USE_PARENT_SSL.getKey())))
@@ -117,12 +118,7 @@ public class FlowEnrichService {
             .ifPresent(commonSslControllerServiceInstanceId -> overrideProcessorsSslControllerService(rootGroup, commonSslControllerServiceInstanceId));
 
         createProvenanceReportingTask(commonSslControllerService.map(VersionedComponent::getInstanceIdentifier).orElse(EMPTY))
-            .ifPresent(provenanceReportingTask -> {
-                List<VersionedReportingTask> currentReportingTasks = ofNullable(versionedDataflow.getReportingTasks()).orElseGet(ArrayList::new);
-                currentReportingTasks.add(provenanceReportingTask);
-                versionedDataflow.setReportingTasks(currentReportingTasks);
-            });
-
+            .ifPresent(versionedDataflow.getReportingTasks()::add);
         byte[] enrichedFlow = toByteArray(versionedDataflow);
         if (LOG.isDebugEnabled()) {
             LOG.debug("Enriched flow with content: \n{}", new String(enrichedFlow, UTF_8));
@@ -159,7 +155,7 @@ public class FlowEnrichService {
         sslControllerService.setName(COMMON_SSL_CONTEXT_SERVICE_NAME);
         sslControllerService.setComments(EMPTY);
         sslControllerService.setType(STANDARD_RESTRICTED_SSL_CONTEXT_SERVICE);
-        sslControllerService.setScheduledState(ScheduledState.ENABLED);
+        sslControllerService.setScheduledState(ENABLED);
         sslControllerService.setBulletinLevel(LogLevel.WARN.name());
         sslControllerService.setComponentType(ComponentType.CONTROLLER_SERVICE);
         sslControllerService.setBundle(createBundle(SSL_CONTEXT_SERVICE_NAR));