Skip to content

Commit 5f92022

Browse files
committed
Added start_time and temp_space fields to JobDescription message
Fixes #43
1 parent a8ca95f commit 5f92022

File tree

4 files changed

+29
-0
lines changed

4 files changed

+29
-0
lines changed

CHANGELOG.md

+17
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,23 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
66

77
## Unreleased
88

9+
## [3.0.0] - 2019-06-14
10+
11+
### Added
12+
13+
* start_time and temp_space fields to JobDescription message ([#43](https://github.com/xenon-middleware/xenon-grpc/issues/43))
14+
* [at](https://linux.die.net/man/1/at) scheduler
15+
16+
### Changed
17+
18+
* Replaced tasks+cores+nodes fields in JobDescription message with nodes+processes+thread fields ([#625](https://github.com/xenon-middleware/xenon/issues/625)).
19+
* Require Java 11 or greater, as xenon package has same compatibility
20+
* Upgraded to Xenon 3.0.0
21+
22+
### Removed
23+
24+
* hdfs filesystem
25+
926
## [2018-03-14] 2.3.0
1027

1128
### Added

src/main/java/nl/esciencecenter/xenon/grpc/schedulers/MapUtils.java

+6
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ public static JobDescription mapJobDescription(XenonProto.JobDescription d) {
9797
if (d.getSchedulerArgumentsCount() > 0) {
9898
description.setSchedulerArguments(d.getSchedulerArgumentsList().toArray(new String[0]));
9999
}
100+
if (!d.getStartTime().equals("")) {
101+
description.setStartTime(d.getStartTime());
102+
}
103+
if (d.getTempSpace() != 0) {
104+
description.setTempSpace(d.getTempSpace());
105+
}
100106
return description;
101107
}
102108

src/main/proto/xenon.proto

+2
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,8 @@ message JobDescription {
346346
uint32 tasks_per_node = 19;
347347
// In Xenon if true then uses setStartPerTask else uses setStartPerJob to configure how to start executable
348348
bool start_per_task = 20;
349+
string start_time = 21;
350+
uint32 temp_space = 22;
349351
}
350352

351353
message SubmitBatchJobRequest {

src/test/java/nl/esciencecenter/xenon/grpc/schedulers/maputils/MapJobDescriptionTest.java

+4
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ public void custom() {
5252
.setName("myjobname")
5353
.setMaxMemory(4096)
5454
.addAllSchedulerArguments(schedulerArgs)
55+
.setStartTime("now")
56+
.setTempSpace(512)
5557
;
5658

5759
XenonProto.JobDescription request = builder.build();
@@ -75,6 +77,8 @@ public void custom() {
7577
expected.setName("myjobname");
7678
expected.setMaxMemory(4096);
7779
expected.setSchedulerArguments("schedarg1", "schedarg2");
80+
expected.setStartTime("now");
81+
expected.setTempSpace(512);
7882
assertEquals(expected, response);
7983
assertEquals(schedulerArgs, response.getSchedulerArguments());
8084
}

0 commit comments

Comments
 (0)