You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2023/03/23 19:45:51 UTC
[airavata-data-lake] branch service_monitoring created (now 2357f58)
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a change to branch service_monitoring
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git
at 2357f58 ProcessManager
This branch includes the following new commits:
new 2357f58 ProcessManager
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[airavata-data-lake] 01/01: ProcessManager
Posted by is...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch service_monitoring
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git
commit 2357f58ffdc0f38a436c3e6f7505376dd82ea553
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Thu Mar 23 15:45:19 2023 -0400
ProcessManager
---
.../apache/airavata/datalake/service/monitor/ProcessManager.java | 1 -
.../apache/airavata/datalake/service/monitor/ServiceMonitor.java | 8 ++++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/service-monitor/src/main/java/org/apache/airavata/datalake/service/monitor/ProcessManager.java b/service-monitor/src/main/java/org/apache/airavata/datalake/service/monitor/ProcessManager.java
index b3a94d8..b42b8bd 100644
--- a/service-monitor/src/main/java/org/apache/airavata/datalake/service/monitor/ProcessManager.java
+++ b/service-monitor/src/main/java/org/apache/airavata/datalake/service/monitor/ProcessManager.java
@@ -39,7 +39,6 @@ public class ProcessManager {
while (iterator.hasNext()) {
synchronized (this) {
String command = iterator.next();
- System.out.println(command);
ProcessBuilder processBuilder = new ProcessBuilder();
processBuilder.command("sh", "-c", command);
Process process = processBuilder.start();
diff --git a/service-monitor/src/main/java/org/apache/airavata/datalake/service/monitor/ServiceMonitor.java b/service-monitor/src/main/java/org/apache/airavata/datalake/service/monitor/ServiceMonitor.java
index ea93a97..085d147 100644
--- a/service-monitor/src/main/java/org/apache/airavata/datalake/service/monitor/ServiceMonitor.java
+++ b/service-monitor/src/main/java/org/apache/airavata/datalake/service/monitor/ServiceMonitor.java
@@ -34,10 +34,14 @@ public class ServiceMonitor {
return null;
}).collect(Collectors.toList());
- processManager.startServices(servicesToBeStarted);
+ List<String> listWithoutNulls = servicesToBeStarted.parallelStream()
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+
+ processManager.startServices(listWithoutNulls);
List<String> failedServices = processManager.getUnavailableServices(new ArrayList<String>(fileMap.keySet()));
- List<String> listWithoutNulls = failedServices.parallelStream()
+ listWithoutNulls = failedServices.parallelStream()
.filter(Objects::nonNull)
.collect(Collectors.toList());