This is an automated email from the ASF dual-hosted git repository. rpardomeza pushed a commit to branch debugger-sidecar in repository https://gitbox.apache.org/repos/asf/incubator-wayang.git
commit 1d326089058fabd8fc4fcfce92f8d2901ae24812 Author: rodrigopardomeza <[email protected]> AuthorDate: Wed Jun 16 12:03:43 2021 -0400 [WAYANG-30] Missing changes 1 --- .../wayang/hackit/sidecar/HackitSidecar.java | 3 + .../hackit/sidecar/webservice/ExecutorManager.java | 4 + .../hackit/sidecar/webservice/WebService.java | 90 +++++++++++++++------- .../src/main/resources/application.properties | 1 + 4 files changed, 71 insertions(+), 27 deletions(-) diff --git a/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/java/org/apache/wayang/hackit/sidecar/HackitSidecar.java b/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/java/org/apache/wayang/hackit/sidecar/HackitSidecar.java index b6933d1..760f5d4 100644 --- a/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/java/org/apache/wayang/hackit/sidecar/HackitSidecar.java +++ b/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/java/org/apache/wayang/hackit/sidecar/HackitSidecar.java @@ -19,6 +19,7 @@ package org.apache.wayang.hackit.sidecar; +import org.apache.wayang.hackit.sidecar.webservice.ExecutorManager; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -26,6 +27,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; public class HackitSidecar { public static void main(String[] args) { + + ExecutorManager.init(); SpringApplication.run(HackitSidecar.class, args); } diff --git a/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/java/org/apache/wayang/hackit/sidecar/webservice/ExecutorManager.java b/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/java/org/apache/wayang/hackit/sidecar/webservice/ExecutorManager.java index bef9676..f3bd83a 100644 --- a/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/java/org/apache/wayang/hackit/sidecar/webservice/ExecutorManager.java +++ b/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/java/org/apache/wayang/hackit/sidecar/webservice/ExecutorManager.java @@ -57,19 +57,23 @@ public class ExecutorManager { processesLogs.put(key, logs); + System.out.println("Submitting processes"); ex.submit(() -> { try { BufferedReader stdInput; for (ProcessBuilder pb : processesNotExecuted) { Process p = pb.start(); + System.out.println("Executing process " + pb.toString()); stdInput = new BufferedReader(new InputStreamReader(p.getInputStream())); + System.out.println("Log:"); stdInput.lines() .forEach( line -> { logs.add(line); + System.out.println(line); } ); } diff --git a/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/java/org/apache/wayang/hackit/sidecar/webservice/WebService.java b/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/java/org/apache/wayang/hackit/sidecar/webservice/WebService.java index 93f4818..7e13f2d 100644 --- a/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/java/org/apache/wayang/hackit/sidecar/webservice/WebService.java +++ b/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/java/org/apache/wayang/hackit/sidecar/webservice/WebService.java @@ -13,6 +13,9 @@ import org.apache.wayang.core.util.ReflectionUtils; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; +import java.io.File; +import java.io.IOException; +import java.nio.file.Paths; import java.util.*; @RestController @@ -40,22 +43,43 @@ public class WebService { @GetMapping("/debug/start") public UUID serviceStart(){ - ProcessBuilder builder_proc1 = new ProcessBuilder("kubectl", "create", "-f", "volume.yaml"); - ProcessBuilder builder_proc2 = new ProcessBuilder("kubectl", "create", "-f", "claim.yaml"); - ProcessBuilder builder_proc3 = new ProcessBuilder("kubectl", "create", "-f", "jobmanager_new.yaml"); - ProcessBuilder builder_proc4 = new ProcessBuilder("kubectl", "create", "-f", "jobmanager-service.yaml"); - ProcessBuilder builder_proc5 = new ProcessBuilder("kubectl", "create", "-f", "taskmanger_new.yaml"); + try { + + String path = Paths.get(".").toRealPath() + "/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/resources/"; + + ProcessBuilder builder_proc1 = new ProcessBuilder("kubectl", "create", "-f", path + "volume.yaml"); + ProcessBuilder builder_proc2 = new ProcessBuilder("kubectl", "create", "-f", path + "claim.yaml"); + ProcessBuilder builder_proc3 = new ProcessBuilder("kubectl", "create", "-f", path + "jobmanager_new.yaml"); + ProcessBuilder builder_proc4 = new ProcessBuilder("kubectl", "create", "-f", path + "jobmanager-service.yaml"); + ProcessBuilder builder_proc5 = new ProcessBuilder("kubectl", "create", "-f", path + "taskmanager_new.yaml"); + ProcessBuilder builder_proc6 = new ProcessBuilder("kubectl", "create", "-f", path + "loadbalancer.yaml"); + + List<ProcessBuilder> processes = new ArrayList<>(); + processes.add(0, builder_proc1); + processes.add(1, builder_proc2); + processes.add(2, builder_proc3); + processes.add(3, builder_proc4); + processes.add(4, builder_proc5); + processes.add(5, builder_proc6); - List<ProcessBuilder> processes = new ArrayList<>(); - processes.add(0, builder_proc1); - processes.add(1, builder_proc2); - processes.add(2, builder_proc3); - processes.add(3, builder_proc4); - processes.add(4, builder_proc5); + UUID ProcessID = ExecutorManager.addThread(processes); - UUID ProcessID = ExecutorManager.addThread(processes); + return ProcessID; - return ProcessID; + /* + System.out.println(Paths.get(".").toRealPath() + "/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/resources"); + + File f = new File(Paths.get(".").toRealPath() + "/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/resources"); + for (String s: f.list() + ) { + System.out.println(s); + }*/ + + } catch (IOException e) { + e.printStackTrace(); + } + + return null; } @GetMapping("/debug/demo") @@ -89,7 +113,7 @@ public class WebService { try { // LocalEnvironment ExecutionEnvironment env = ExecutionEnvironment.createRemoteEnvironment("127.0.0.1", 8081); - + //ExecutionEnvironment env = ExecutionEnvironment.createRemoteEnvironment("127.0.0.1", 57261, getJars()); //DataSet<String> data = env.readTextFile("file:///Users/rodrigopardomeza/flink/count"); DataSet<String> data = env.readTextFile("/mnt/example/count"); @@ -127,22 +151,34 @@ public class WebService { @GetMapping("/debug/stop") public UUID serviceStop(){ - ProcessBuilder builder_proc1 = new ProcessBuilder("kubectl", "delete", "-f", "volume.yaml"); - ProcessBuilder builder_proc2 = new ProcessBuilder("kubectl", "delete", "-f", "claim.yaml"); - ProcessBuilder builder_proc3 = new ProcessBuilder("kubectl", "delete", "-f", "jobmanager_new.yaml"); - ProcessBuilder builder_proc4 = new ProcessBuilder("kubectl", "delete", "-f", "jobmanager-service.yaml"); - ProcessBuilder builder_proc5 = new ProcessBuilder("kubectl", "delete", "-f", "taskmanger_new.yaml"); + try{ + String path = Paths.get(".").toRealPath() + "/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/resources/"; + + ProcessBuilder builder_proc1 = new ProcessBuilder("kubectl", "delete", "-f", path + "loadbalancer.yaml"); + ProcessBuilder builder_proc2 = new ProcessBuilder("kubectl", "delete", "-f", path + "jobmanager-service.yaml"); + ProcessBuilder builder_proc3 = new ProcessBuilder("kubectl", "delete", "-f", path + "taskmanager_new.yaml"); + ProcessBuilder builder_proc4 = new ProcessBuilder("kubectl", "delete", "-f", path + "jobmanager_new.yaml"); + ProcessBuilder builder_proc5 = new ProcessBuilder("kubectl", "delete", "-f", path + "claim.yaml"); + ProcessBuilder builder_proc6 = new ProcessBuilder("kubectl", "delete", "-f", path + "volume.yaml"); + + // For now execute: kubectl port-forward deployment/jobmanager 8081:8081 - List<ProcessBuilder> processes = new ArrayList<>(); - processes.add(0, builder_proc1); - processes.add(1, builder_proc2); - processes.add(2, builder_proc3); - processes.add(3, builder_proc4); - processes.add(4, builder_proc5); + List<ProcessBuilder> processes = new ArrayList<>(); + processes.add(0, builder_proc1); + processes.add(1, builder_proc2); + processes.add(2, builder_proc3); + processes.add(3, builder_proc4); + processes.add(4, builder_proc5); + processes.add(5, builder_proc6); - UUID ProcessID = ExecutorManager.addThread(processes); + UUID ProcessID = ExecutorManager.addThread(processes); + + return ProcessID; + } catch (IOException e) { + e.printStackTrace(); + } - return ProcessID; + return null; } @PostMapping(path = "/debug/check") diff --git a/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/resources/application.properties b/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/resources/application.properties index e69de29..8d51d0c 100644 --- a/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/resources/application.properties +++ b/wayang-plugins/wayang-hackit/wayang-hackit-sidecar/src/main/resources/application.properties @@ -0,0 +1 @@ +server.port=8082 \ No newline at end of file
