Commit 1e9fabf5 authored by Unai's avatar Unai 🇵🇲

Added some fields to the classes

parent bd77ffdb
version: '3.4'
services:
logicmodule:
image: "bscdataclay/logicmodule:2.0"
image: "bscdataclay/logicmodule:2.1"
ports:
- "11034:11034"
environment:
......@@ -18,7 +18,7 @@ services:
test: ["CMD-SHELL", "/dataclay/health/health_check.sh"]
dsjava:
image: "bscdataclay/dsjava:2.0"
image: "bscdataclay/dsjava:2.1"
ports:
- "2127:2127"
depends_on:
......@@ -35,4 +35,4 @@ services:
interval: 5s
retries: 10
test: ["CMD-SHELL", "/dataclay/health/health_check.sh"]
\ No newline at end of file
......@@ -8,7 +8,7 @@ export DATACLAYGLOBALCONFIG=/home/unai/WORK/dataclay/bin/cfgfiles/global.propert
export DATACLAYSESSIONCONFIG=/home/unai/WORK/dataclay/bin/cfgfiles/session.properties
export DATACLAY_JAR=/home/unai/WORK/dataclay/bin/dataclay.jar
docker-compose -f ../dataclay/docker-compose.yml down && docker-compose -f ../dataclay/docker-compose.yml up -d
docker-compose -f ../dataclay/docker-compose.yml down -v && docker-compose -f ../dataclay/docker-compose.yml up -d
rm -rf stubs*
mkdir stubs
......
......@@ -16,7 +16,7 @@
<dependency>
<groupId>es.bsc.dataclay</groupId>
<artifactId>dataclay</artifactId>
<version>2.0</version>
<version>2.1</version>
</dependency>
</dependencies>
</project>
......@@ -9,6 +9,9 @@ public class COMPSsApplication {
/** COMPSsApplication name. */
private String name;
/** COMPSsApplication arguments */
private String [] args;
/** COMPSsApplication UUID (to be able to tell it apart of other workflows with the same name) */
private String uuid;
......@@ -22,8 +25,9 @@ public class COMPSsApplication {
* COMPSsApplication constructor.
* @param appName Name of the application
*/
public COMPSsApplication(final String appName, final String uuid) {
public COMPSsApplication(final String appName, final String [] args, final String uuid) {
this.name = appName;
this.args = args;
this.uuid = uuid;
}
......@@ -44,7 +48,15 @@ public class COMPSsApplication {
workers.add(worker);
}
/**
/**
* Get arguments of the application
* @return Application arguments
*/
public String[] getArgs() {
return args;
}
/**
* Get application master.
* @return COMPSsApplication master
*/
......
......@@ -24,6 +24,7 @@ public class Master extends DataClayObject {
public Master(final Node node, final int pid) {
this.node = node;
this.pid = pid;
node.addMaster(this);
}
/**
......
......@@ -29,6 +29,7 @@ public class Worker extends DataClayObject {
this.node = node;
this.pid = pid;
this.active = active;
node.addWorker(this);
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment