markap14 commented on a change in pull request #4337: URL: https://github.com/apache/nifi/pull/4337#discussion_r442458341
########## File path: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ProcessorSummaryStatusEndpointMerger.java ########## @@ -0,0 +1,100 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.nifi.cluster.coordination.http.endpoints; + +import org.apache.nifi.cluster.coordination.http.EndpointResponseMerger; +import org.apache.nifi.cluster.manager.NodeResponse; +import org.apache.nifi.cluster.manager.PermissionsDtoMerger; +import org.apache.nifi.controller.status.RunStatus; +import org.apache.nifi.web.api.dto.ProcessorScheduleSummaryDTO; +import org.apache.nifi.web.api.entity.ProcessorScheduleSummariesEntity; +import org.apache.nifi.web.api.entity.ProcessorScheduleSummaryEntity; + +import java.net.URI; +import java.util.ArrayList; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +public class ProcessorSummaryStatusEndpointMerger implements EndpointResponseMerger { + public static final String SCHEDULE_SUMMARY_URI = "/nifi-api/processors/schedule-summaries/query"; + + @Override + public boolean canHandle(final URI uri, final String method) { + return "POST".equalsIgnoreCase(method) && SCHEDULE_SUMMARY_URI.equals(uri.getPath()); + } + + @Override + public NodeResponse merge(final URI uri, final String method, final Set<NodeResponse> successfulResponses, final Set<NodeResponse> problematicResponses, final NodeResponse clientResponse) { + if (!canHandle(uri, method)) { + throw new IllegalArgumentException("Cannot use Endpoint Mapper of type " + getClass().getSimpleName() + " to map responses for URI " + uri + ", HTTP Method " + method); + } + + final ProcessorScheduleSummariesEntity responseEntity = clientResponse.getClientResponse().readEntity(ProcessorScheduleSummariesEntity.class); + + // Create mapping of Processor ID to its schedule Summary. + final Map<String, ProcessorScheduleSummaryEntity> scheduleSummaries = responseEntity.getScheduleSummaries().stream() + .collect(Collectors.toMap(entity -> entity.getScheduleSummary().getId(), entity -> entity)); + + for (final NodeResponse nodeResponse : successfulResponses) { + final ProcessorScheduleSummariesEntity nodeResponseEntity = nodeResponse == clientResponse ? responseEntity : + nodeResponse.getClientResponse().readEntity(ProcessorScheduleSummariesEntity.class); + + for (final ProcessorScheduleSummaryEntity processorEntity : nodeResponseEntity.getScheduleSummaries()) { + final String processorId = processorEntity.getScheduleSummary().getId(); + + final ProcessorScheduleSummaryEntity mergedEntity = scheduleSummaries.computeIfAbsent(processorId, id -> new ProcessorScheduleSummaryEntity()); + merge(mergedEntity, processorEntity); + } + } + + final ProcessorScheduleSummariesEntity mergedEntity = new ProcessorScheduleSummariesEntity(); + mergedEntity.setScheduleSummaries(new ArrayList<>(scheduleSummaries.values())); + return new NodeResponse(clientResponse, mergedEntity); + } + + private void merge(final ProcessorScheduleSummaryEntity target, final ProcessorScheduleSummaryEntity additional) { + PermissionsDtoMerger.mergePermissions(target.getPermissions(), additional.getPermissions()); + + final ProcessorScheduleSummaryDTO targetSummaryDto = target.getScheduleSummary(); + final ProcessorScheduleSummaryDTO additionalSummaryDto = additional.getScheduleSummary(); + + // If name is null, it's because of permissions, so we want to nullify it in the target. + if (additionalSummaryDto.getName() == null) { + targetSummaryDto.setName(null); + } + + targetSummaryDto.setActiveThreadCount(targetSummaryDto.getActiveThreadCount() + additionalSummaryDto.getActiveThreadCount()); + + final String additionalRunStatus = additionalSummaryDto.getRunStatus(); Review comment: Looking at how we merge the RunStatus in StatusMerger, I see the confusion/issue. We should only be checking for states of Invalid / Validating. If the additional run status is Validating or Invalid, then set the target's RunStatus to that. Otherwise, leave it as is. That way, if any node has a status of Validating/Invalid, then that will take precedence. Which one of those wins doesn't really matter, as mentioned above. This is the logic used elsewhere, so will update this PR to use that logic as well. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
