From 6a4f2cf1ffc0989faff4b8ecdd0ecab91c318574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magdalena=20Grodzi=C5=84ska?= Date: Sat, 23 Nov 2019 19:00:29 +0100 Subject: Refactor fetcher controller --- .../pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java | 148 +++++++++++++++------ 1 file changed, 110 insertions(+), 38 deletions(-) (limited to 'src/main/java/pl/edu/mimuw/cloudatlas/fetcher') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java b/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java index f7fdab2..a864e03 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java @@ -2,74 +2,146 @@ package pl.edu.mimuw.cloudatlas.fetcher; import pl.edu.mimuw.cloudatlas.api.Api; +import java.rmi.NotBoundException; +import java.rmi.RemoteException; import java.rmi.registry.LocateRegistry; import java.rmi.registry.Registry; import java.io.*; import java.util.ArrayList; import java.util.List; +import java.util.Map; import com.google.gson.Gson; +import pl.edu.mimuw.cloudatlas.model.*; public class Fetcher { + private static final Map fetcherAttributes = Map.ofEntries( + Map.entry("cpu_load", Type.PrimaryType.DOUBLE), + Map.entry("free_disk", Type.PrimaryType.INT), + Map.entry("total_disk", Type.PrimaryType.INT), + Map.entry("free_ram", Type.PrimaryType.INT), + Map.entry("total_ram", Type.PrimaryType.INT), + Map.entry("free_swap", Type.PrimaryType.INT), + Map.entry("total_swap", Type.PrimaryType.INT), + Map.entry("num_processes", Type.PrimaryType.INT), + Map.entry("num_cores", Type.PrimaryType.INT), + Map.entry("kernel_ver", Type.PrimaryType.STRING), + Map.entry("logged_users", Type.PrimaryType.INT), + Map.entry("dns_names", Type.PrimaryType.LIST) + ); + + private static final List fetcherAttributeNames = List.of( + "avg_load", + "free_disk", + "total_disk", + "free_ram", + "total_ram", + "free_swap", + "total_swap", + "num_processes", + "num_cores", + "kernel_ver", + "logged_users", + "dns_names" + ); + + private static final List fetcherAttributeTypes = List.of( + Type.PrimaryType.DOUBLE, + Type.PrimaryType.INT, + Type.PrimaryType.INT, + Type.PrimaryType.INT, + Type.PrimaryType.INT, + Type.PrimaryType.INT, + Type.PrimaryType.INT, + Type.PrimaryType.INT, + Type.PrimaryType.INT, + Type.PrimaryType.STRING, + Type.PrimaryType.INT, + Type.PrimaryType.LIST + ); + + private static Api api; + private static Process pythonProcess; + + private static Value packAttributeValue(Object rawValue, Type.PrimaryType valueType) { + Value val = null; + ArrayList contacts = new ArrayList(); + + if (valueType.equals(Type.PrimaryType.STRING)) { + val = new ValueString((String) rawValue); + } else if (valueType.equals(Type.PrimaryType.INT)) { + val = new ValueInt(((Double) rawValue).longValue()); + } else if (valueType.equals(Type.PrimaryType.DOUBLE)) { + val = new ValueDouble((Double) rawValue); + } else if (valueType.equals(Type.PrimaryType.LIST)) { + for (Object c : (ArrayList) rawValue) { + contacts.add(new ValueString((String) c)); + } + val = new ValueList(contacts, TypePrimitive.STRING); + } else { + throw new UnsupportedOperationException(); + } -// private static String processAttribs(String jsonAttribs) { -// Serializer serializer = new Serializer(); -// return -// } + return val; + } + + private static void initializeApiStub() throws RemoteException, NotBoundException { + Registry registry = LocateRegistry.getRegistry("localhost"); + api = (Api) registry.lookup("Api"); + System.out.println("Fetcher runs with registry"); + } - // https://jj09.net/interprocess-communication-python-java/ - private static void fetchData() { - try { - Registry registry = LocateRegistry.getRegistry("localhost"); - Api stub = (Api) registry.lookup("Api"); - System.out.println("Fetcher runs with registry"); // TODO + private static void initializePythonProcess() throws IOException { + String pythonScript = Fetcher.class.getResource("data_fetcher.py").getFile(); + String pythonCmd = "/usr/bin/python3 " + pythonScript; + System.out.println("Run cmd: " + pythonCmd); + pythonProcess = Runtime.getRuntime().exec(pythonCmd); + System.out.println("Fetcher pid " + ProcessHandle.current().pid()); + System.out.println("Python process running with PID: " + pythonProcess.pid()); + } - String pythonScript = Fetcher.class.getResource("data_fetcher.py").getFile(); - String pythonCmd = "/usr/bin/python3 " + pythonScript; - System.out.println("cmd: " + pythonCmd); - Process p = Runtime.getRuntime().exec(pythonCmd); - BufferedReader bufferRead = new BufferedReader( new InputStreamReader(p.getInputStream())); - BufferedReader errorRead = new BufferedReader( new InputStreamReader(p.getErrorStream())); + private static ArrayList deserializeAttribs(String serializedAttribs) { + Gson g = new Gson(); + return g.fromJson(serializedAttribs, ArrayList.class); + } + // https://jj09.net/interprocess-communication-python-java/ + private static void fetchData() { + BufferedReader bufferRead; + ArrayList deserializedAttribs; + String jsonAttribs; - System.out.println("Gonna read some attribs"); - String jsonAttribs = bufferRead.readLine(); - String serializedAttribs; + System.out.println(System.getProperty("user.dir")); - System.out.println("Read some attribs"); - System.out.println(jsonAttribs); - System.out.println("Got some attribs"); + try { + initializeApiStub(); + initializePythonProcess(); - ArrayList aa = deserializeAttribs(jsonAttribs); - System.out.println(aa); + bufferRead = new BufferedReader( new InputStreamReader(pythonProcess.getInputStream())); - // TODO different condition - while(!jsonAttribs.equals("x")) { + while((jsonAttribs = bufferRead.readLine()) != null) { System.out.println(jsonAttribs); System.out.flush(); - serializedAttribs = "1"; - // stub.setAttributeValue(serializedAttribs); - jsonAttribs = bufferRead.readLine(); + deserializedAttribs = deserializeAttribs(jsonAttribs); + for (int i = 0; i < fetcherAttributeNames.size(); i++) { + api.setAttributeValue( + "/", + fetcherAttributeNames.get(i), + packAttributeValue( + deserializedAttribs.get(i), + fetcherAttributeTypes.get(i))); + } } bufferRead.close(); - } catch(IOException e) { - e.printStackTrace(); } catch (Exception e) { System.err.println("Fetcher exception:"); e.printStackTrace(); } } - public static void main(String[] args) { fetchData(); } - - public static ArrayList deserializeAttribs(String serializedAttribs) { - Gson g = new Gson(); - - return g.fromJson(serializedAttribs, ArrayList.class); - } } -- cgit v1.2.3 From e1f8ec3cc27dfb5f31bc3f8fdb98630bcf2d7153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magdalena=20Grodzi=C5=84ska?= Date: Sun, 24 Nov 2019 14:06:59 +0100 Subject: Remove unused const values --- .../java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/main/java/pl/edu/mimuw/cloudatlas/fetcher') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java b/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java index a864e03..8d64a56 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java @@ -15,21 +15,6 @@ import com.google.gson.Gson; import pl.edu.mimuw.cloudatlas.model.*; public class Fetcher { - private static final Map fetcherAttributes = Map.ofEntries( - Map.entry("cpu_load", Type.PrimaryType.DOUBLE), - Map.entry("free_disk", Type.PrimaryType.INT), - Map.entry("total_disk", Type.PrimaryType.INT), - Map.entry("free_ram", Type.PrimaryType.INT), - Map.entry("total_ram", Type.PrimaryType.INT), - Map.entry("free_swap", Type.PrimaryType.INT), - Map.entry("total_swap", Type.PrimaryType.INT), - Map.entry("num_processes", Type.PrimaryType.INT), - Map.entry("num_cores", Type.PrimaryType.INT), - Map.entry("kernel_ver", Type.PrimaryType.STRING), - Map.entry("logged_users", Type.PrimaryType.INT), - Map.entry("dns_names", Type.PrimaryType.LIST) - ); - private static final List fetcherAttributeNames = List.of( "avg_load", "free_disk", -- cgit v1.2.3 From 66af643cca0fee4b143fb4fb97ddcff952e1a214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magdalena=20Grodzi=C5=84ska?= Date: Sun, 24 Nov 2019 14:11:28 +0100 Subject: Retrofit list initalization so that CI is happy --- src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/pl/edu/mimuw/cloudatlas/fetcher') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java b/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java index 8d64a56..29597eb 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java @@ -8,14 +8,14 @@ import java.rmi.registry.LocateRegistry; import java.rmi.registry.Registry; import java.io.*; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; -import java.util.Map; import com.google.gson.Gson; import pl.edu.mimuw.cloudatlas.model.*; public class Fetcher { - private static final List fetcherAttributeNames = List.of( + private static final List fetcherAttributeNames = Arrays.asList( "avg_load", "free_disk", "total_disk", @@ -30,7 +30,7 @@ public class Fetcher { "dns_names" ); - private static final List fetcherAttributeTypes = List.of( + private static final List fetcherAttributeTypes = Arrays.asList( Type.PrimaryType.DOUBLE, Type.PrimaryType.INT, Type.PrimaryType.INT, -- cgit v1.2.3 From 3b53e5496e9fe9917db7825ceea1455cca75c155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magdalena=20Grodzi=C5=84ska?= Date: Sun, 24 Nov 2019 14:13:54 +0100 Subject: Remove pid logs as CI is still not happy --- src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/main/java/pl/edu/mimuw/cloudatlas/fetcher') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java b/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java index 29597eb..1d4a2ce 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/fetcher/Fetcher.java @@ -81,8 +81,6 @@ public class Fetcher { String pythonCmd = "/usr/bin/python3 " + pythonScript; System.out.println("Run cmd: " + pythonCmd); pythonProcess = Runtime.getRuntime().exec(pythonCmd); - System.out.println("Fetcher pid " + ProcessHandle.current().pid()); - System.out.println("Python process running with PID: " + pythonProcess.pid()); } private static ArrayList deserializeAttribs(String serializedAttribs) { -- cgit v1.2.3