Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
nfrtool-dataclay-model
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ELASTIC-H2020
ELASTIC-SA
NFR-Tool
nfrtool-dataclay-model
Commits
1e9fabf5
Commit
1e9fabf5
authored
Feb 14, 2020
by
Unai
🇵🇲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added some fields to the classes
parent
bd77ffdb
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
7 deletions
+21
-7
dataclay/docker-compose.yml
dataclay/docker-compose.yml
+3
-3
model/get_stubs.sh
model/get_stubs.sh
+1
-1
model/pom.xml
model/pom.xml
+1
-1
model/src/main/java/es/bsc/compss/nfr/model/COMPSsApplication.java
.../main/java/es/bsc/compss/nfr/model/COMPSsApplication.java
+14
-2
model/src/main/java/es/bsc/compss/nfr/model/Master.java
model/src/main/java/es/bsc/compss/nfr/model/Master.java
+1
-0
model/src/main/java/es/bsc/compss/nfr/model/Worker.java
model/src/main/java/es/bsc/compss/nfr/model/Worker.java
+1
-0
No files found.
dataclay/docker-compose.yml
View file @
1e9fabf5
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
model/get_stubs.sh
View file @
1e9fabf5
...
...
@@ -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
...
...
model/pom.xml
View file @
1e9fabf5
...
...
@@ -16,7 +16,7 @@
<dependency>
<groupId>
es.bsc.dataclay
</groupId>
<artifactId>
dataclay
</artifactId>
<version>
2.
0
</version>
<version>
2.
1
</version>
</dependency>
</dependencies>
</project>
model/src/main/java/es/bsc/compss/nfr/model/COMPSsApplication.java
View file @
1e9fabf5
...
...
@@ -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
*/
...
...
model/src/main/java/es/bsc/compss/nfr/model/Master.java
View file @
1e9fabf5
...
...
@@ -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
);
}
/**
...
...
model/src/main/java/es/bsc/compss/nfr/model/Worker.java
View file @
1e9fabf5
...
...
@@ -29,6 +29,7 @@ public class Worker extends DataClayObject {
this
.
node
=
node
;
this
.
pid
=
pid
;
this
.
active
=
active
;
node
.
addWorker
(
this
);
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment