You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2021/11/10 14:18:51 UTC
[nifi] branch main updated: NIFI-9371 Removed synchronized keyword
from Active Threads methods (#5513)
This is an automated email from the ASF dual-hosted git repository.
markap14 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 5aced2b NIFI-9371 Removed synchronized keyword from Active Threads methods (#5513)
5aced2b is described below
commit 5aced2b4bc66d2dd85b1507755fff2b1fb8c4a64
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Wed Nov 10 08:18:41 2021 -0600
NIFI-9371 Removed synchronized keyword from Active Threads methods (#5513)
- ConcurrentHashMap collection for Active Threads eliminates the need for method synchronization
- Replaced System.out.println() with Logger.info() in nifi-system-test-suite classes
---
.../org/apache/nifi/controller/StandardProcessorNode.java | 8 ++++----
.../java/org/apache/nifi/tests/system/NiFiClientUtil.java | 6 +++---
.../tests/system/SpawnedStandaloneNiFiInstanceFactory.java | 14 +++++++++-----
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
index 0e47331..d9e29ad 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
@@ -1515,18 +1515,18 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable
}
}
- private synchronized void activateThread() {
+ private void activateThread() {
final Thread thread = Thread.currentThread();
final Long timestamp = System.currentTimeMillis();
activeThreads.put(thread, new ActiveTask(timestamp));
}
- private synchronized void deactivateThread() {
+ private void deactivateThread() {
activeThreads.remove(Thread.currentThread());
}
@Override
- public synchronized List<ActiveThreadInfo> getActiveThreads(final ThreadDetails threadDetails) {
+ public List<ActiveThreadInfo> getActiveThreads(final ThreadDetails threadDetails) {
final long now = System.currentTimeMillis();
final Map<Long, ThreadInfo> threadInfoMap = Stream.of(threadDetails.getThreadInfos())
@@ -1550,7 +1550,7 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable
}
@Override
- public synchronized int getTerminatedThreadCount() {
+ public int getTerminatedThreadCount() {
int count = 0;
for (final ActiveTask task : activeThreads.values()) {
if (task.isTerminated()) {
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java
index 58a86d9..4a5851e 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java
@@ -525,13 +525,13 @@ public class NiFiClientUtil {
while (true) {
final List<ControllerServiceEntity> nonDisabledServices = getControllerServicesNotInState(groupId, desiredState, serviceIdsOfInterest);
if (nonDisabledServices.isEmpty()) {
- System.out.println(String.format("All Controller Services in Process Group %s now have desired state of %s", groupId, desiredState));
+ logger.info("Process Group [{}] Controller Services have desired state [{}]", groupId, desiredState);
return;
}
final ControllerServiceEntity entity = nonDisabledServices.get(0);
- System.out.println(String.format("Controller Service with ID %s and type %s has a State of %s while waiting for state of %s; will wait 500 millis and check again", entity.getId(),
- entity.getComponent().getType(), entity.getComponent().getState(), desiredState));
+ logger.info("Controller Service ID [{}] Type [{}] State [{}] waiting for State [{}]: sleeping for 500 ms before retrying", entity.getId(),
+ entity.getComponent().getType(), entity.getComponent().getState(), desiredState);
try {
Thread.sleep(500L);
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/SpawnedStandaloneNiFiInstanceFactory.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/SpawnedStandaloneNiFiInstanceFactory.java
index 412dd0f..9e04f6d 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/SpawnedStandaloneNiFiInstanceFactory.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/SpawnedStandaloneNiFiInstanceFactory.java
@@ -22,6 +22,8 @@ import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClient;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientConfig;
import org.apache.nifi.toolkit.cli.impl.client.nifi.impl.JerseyNiFiClient;
import org.apache.nifi.util.file.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileInputStream;
@@ -38,6 +40,8 @@ import java.util.Properties;
import static org.junit.Assert.assertTrue;
public class SpawnedStandaloneNiFiInstanceFactory implements NiFiInstanceFactory {
+ private static final Logger logger = LoggerFactory.getLogger(SpawnedStandaloneNiFiInstanceFactory.class);
+
private final InstanceConfiguration instanceConfig;
public SpawnedStandaloneNiFiInstanceFactory(final InstanceConfiguration instanceConfig) {
@@ -88,7 +92,7 @@ public class SpawnedStandaloneNiFiInstanceFactory implements NiFiInstanceFactory
throw new IllegalStateException("NiFi has already been started");
}
- System.out.println("Starting instance " + instanceDirectory.getName());
+ logger.info("Starting NiFi [{}]", instanceDirectory.getName());
try {
this.runNiFi = new RunNiFi(bootstrapConfigFile);
@@ -108,7 +112,7 @@ public class SpawnedStandaloneNiFiInstanceFactory implements NiFiInstanceFactory
}
public void createEnvironment() throws IOException {
- System.out.println("Creating environment for instance " + instanceDirectory.getName());
+ logger.info("Creating environment for NiFi [{}]", instanceDirectory.getName());
cleanup();
@@ -193,7 +197,7 @@ public class SpawnedStandaloneNiFiInstanceFactory implements NiFiInstanceFactory
while (true) {
try {
client.getFlowClient().getRootGroupId();
- System.out.println("Completed startup of instance " + instanceDirectory.getName());
+ logger.info("Startup Completed NiFi [{}]", instanceDirectory.getName());
return;
} catch (final Exception e) {
try {
@@ -212,11 +216,11 @@ public class SpawnedStandaloneNiFiInstanceFactory implements NiFiInstanceFactory
return;
}
- System.out.println("Stopping instance " + instanceDirectory.getName());
+ logger.info("Shutdown Started NiFi [{}]", instanceDirectory.getName());
try {
runNiFi.stop();
- System.out.println("Completed shutdown of instance " + instanceDirectory.getName());
+ logger.info("Shutdown Completed NiFi [{}]", instanceDirectory.getName());
} catch (IOException e) {
throw new RuntimeException("Failed to stop NiFi", e);
} finally {