From 1c7791542314688b1ebc925de4269f8fb394a43f Mon Sep 17 00:00:00 2001 From: Nunzio Andrea Galante Date: Tue, 21 Feb 2017 09:59:25 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@142822 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../poolmanager/ansible/AnsibleWorker.java | 21 ++++++++++++++++--- .../ansiblebridge/AnsibleBridge.java | 2 ++ .../poolmanager/clients/ISClient.java | 10 ++++++++- .../service/DataminerPoolManager.java | 3 +-- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansible/AnsibleWorker.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansible/AnsibleWorker.java index 1208e0b..2b8b6e5 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansible/AnsibleWorker.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansible/AnsibleWorker.java @@ -1,7 +1,10 @@ package org.gcube.dataanalysis.dataminer.poolmanager.ansible; +import java.io.BufferedReader; import java.io.File; ***REMOVED*** +import java.io.InputStreamReader; +import java.io.OutputStream; import org.gcube.dataanalysis.dataminer.poolmanager.ansible.model.Inventory; import org.gcube.dataanalysis.dataminer.poolmanager.ansible.model.Playbook; @@ -62,7 +65,7 @@ public class AnsibleWorker ***REMOVED*** public void removeWorkStructure() ***REMOVED*** ***REMOVED*** remove the working dir -***REMOVED*** this.getWorkdir().delete(); + ***REMOVED***this.getWorkdir().delete(); ***REMOVED*** public File getPlaybookFile() ***REMOVED*** @@ -91,9 +94,21 @@ public class AnsibleWorker ***REMOVED*** - public void apply() ***REMOVED*** + public void apply() throws IOException ***REMOVED*** ***REMOVED*** TODO execute the playbook and return output - System.out.println("TODO: execute: ansible-playbook -v -i " + this.getInventoryFile().getName() + " " + this.getPlaybookFile().getName()); + try ***REMOVED*** + System.out.println("ansible-playbook -v -i " + this.getInventoryFile().getName() + " " + this.getPlaybookFile().getName()); + Process p = Runtime.getRuntime().exec("ansible-playbook -v -i " + this.getInventoryFile().getName() + " " + this.getPlaybookFile().getName()); + BufferedReader in = new BufferedReader( + new InputStreamReader(p.getInputStream())); + String line = null; + while ((line = in.readLine()) != null) ***REMOVED*** + System.out.println(line); + ***REMOVED*** + ***REMOVED*** catch (IOException e) ***REMOVED*** + e.printStackTrace(); + ***REMOVED*** + ***REMOVED***System.out.println("TODO: execute: ansible-playbook -v -i " + this.getInventoryFile().getName() + " " + this.getPlaybookFile().getName()); ***REMOVED*** /** diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/AnsibleBridge.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/AnsibleBridge.java index 3cc4592..e1ea3dc 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/AnsibleBridge.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/AnsibleBridge.java @@ -202,8 +202,10 @@ public class AnsibleBridge ***REMOVED*** FileOutputStream fos = new FileOutputStream(n); PrintStream ps = new PrintStream(fos); System.setOut(ps); + System.setErr(ps); worker.apply(); System.setOut(console); + System.setErr(console); worker.apply(); System.out.println("Log stored to to " + n.getAbsolutePath()); diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/ISClient.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/ISClient.java index 6aa79be..fa3c120 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/ISClient.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/ISClient.java @@ -8,6 +8,8 @@ import java.util.Collection; import java.util.Vector; import org.gcube.common.resources.gcore.ServiceEndpoint; +***REMOVED*** +import org.gcube.dataanalysis.dataminer.poolmanager.datamodel.Domain; import org.gcube.dataanalysis.dataminer.poolmanager.datamodel.Host; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.SimpleQuery; @@ -27,7 +29,8 @@ public class ISClient ***REMOVED*** if (!remote) ***REMOVED*** Collection out = new Vector<>(); Host h = new Host(); - h.setName("bb-dataminer.res.eng.it"); + ***REMOVED***h.setName("bb-dataminer.res.eng.it"); + h.setName("vm123.ui.savba.sk"); out.add(h); return out; ***REMOVED*** else ***REMOVED*** @@ -51,4 +54,9 @@ public class ISClient ***REMOVED*** ***REMOVED*** ***REMOVED*** +***REMOVED*** public static void main(String[] args) ***REMOVED*** +***REMOVED*** ISClient a = new ISClient(); +***REMOVED*** ScopeProvider.instance.set("/gcube/devNext/NextNext"); +***REMOVED*** System.out.println(a.listDataminersInVRE()); +***REMOVED******REMOVED*** ***REMOVED*** diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java index 8daf96a..238b9c3 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java @@ -207,7 +207,7 @@ public class DataminerPoolManager implements PoolManager ***REMOVED*** ***REMOVED***; new Thread(r).start(); ***REMOVED***this line will execute immediately, not waiting for your task to complete - System.out.println(uuid); + System.out.println(uuid); return uuid; ***REMOVED*** @@ -235,7 +235,6 @@ public class DataminerPoolManager implements PoolManager ***REMOVED*** ***REMOVED*** apply the changes AnsibleBridge a = new AnsibleBridge(); - return a.applyAlgorithmSetToCluster(algorithms, cluster,uuid).getWorkerId(); ***REMOVED***