This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new b85063cb81 NIFI-11681: Terminate Process Sessions before interrupting
processor threads
b85063cb81 is described below
commit b85063cb81210a733a214b7e2427d949ce51005f
Author: Mark Payne <[email protected]>
AuthorDate: Mon Jun 12 16:55:41 2023 -0400
NIFI-11681: Terminate Process Sessions before interrupting processor threads
This closes #7371
Signed-off-by: David Handermann <[email protected]>
(cherry picked from commit 787e0d82614e345b5afbef6691c418c43cf0ab08)
---
.../org/apache/nifi/controller/scheduling/StandardProcessScheduler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
index e2aa0345b7..7c43431c2c 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
@@ -436,8 +436,8 @@ public final class StandardProcessScheduler implements
ProcessScheduler {
LOG.debug("Terminating {}", procNode);
- final int tasksTerminated = procNode.terminate();
state.terminate();
+ final int tasksTerminated = procNode.terminate();
getSchedulingAgent(procNode).incrementMaxThreadCount(tasksTerminated);
