Skip to content

Commit

Permalink
Merge pull request #670 from xenon-middleware/jobstatus-bug
Browse files Browse the repository at this point in the history
Adds Slurm 19 support
  • Loading branch information
jmaassen authored Mar 20, 2020
2 parents 0972eae + e3f2c89 commit 8457939
Show file tree
Hide file tree
Showing 354 changed files with 200,457 additions and 206 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ matrix:
organization: nlesc
before_install:
- docker-compose --version
- ./gradlew --version
install:
- ./gradlew assemble
script:
Expand All @@ -30,13 +31,15 @@ matrix:
- sonar-scanner -Dsonar.login=$SONAR_TOKEN;

- os: osx
jdk: openjdk11
env:
- INTEGRATION_TEST="livelocal"
- JDK=openjdk11
- OS=osx
osx_image: xcode10.1
script:
- ./src/liveTest/resources/scripts/create_symlinks;
- ./gradlew --version
- ./gradlew test liveTest -Dxenon.scheduler=local -Dxenon.filesystem=file -Dxenon.filesystem.location=/ -Dxenon.scheduler.location=$PWD -Dxenon.username=$USERNAME -Dxenon.filesystem.basedir=$PWD -Dxenon.filesystem.expected.workdir=/ -Dxenon.scheduler.workdir=$PWD -Dxenon.scheduler.supportsInteractive=1 -Dxenon.scheduler.isEmbedded=1
after_script:
- ./gradlew jacocoTestReport jacocoLiveTestReport
Expand Down
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
Xenon 3.0.4
Xenon 3.1.0
-----------

This is release 3.0.4 of Xenon.
This is release 3.1.0 of Xenon.

Notable changes compared to v3.0.4:
-----------------------------------

- improved error state returned by getJobStatusses to show the difference between no job and connection loss.
- added support for slurm 19
- added heartbeat in the SSH adaptor quickly detect lost connections.
- moved to version 2.4.0 of SSHD

Notable changes compared to v3.0.3:
-----------------------------------
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ authors:
given-names: Arnold
orcid: "https://orcid.org/0000-0003-1711-7961"
cff-version: "1.0.3"
date-released: 2019-09-10
date-released: 2020-03-20
doi: "10.5281/zenodo.597993"
keywords:
- Java
Expand All @@ -79,4 +79,4 @@ license: Apache-2.0
message: "If you use this software, please cite it using these metadata."
repository-code: "https://github.com/xenon-middleware/xenon"
title: Xenon
version: "3.0.4"
version: "3.1.0"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3692/badge)](https://bestpractices.coreinfrastructure.org/projects/3692)


Copyright 2013-2019 The Netherlands eScience Center
Copyright 2013-2020 The Netherlands eScience Center

## What problem does Xenon solve?

Expand Down Expand Up @@ -92,7 +92,7 @@ and

```gradle
dependencies {
compile group: 'nl.esciencecenter.xenon', name: 'xenon', version: '3.0.4'
compile group: 'nl.esciencecenter.xenon', name: 'xenon', version: '3.1.0'
}
```
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ dependencies {
compile group: 'commons-net', name: 'commons-net', version: '3.3'

// ssh and sftp
compile group: 'org.apache.sshd', name: 'sshd-mina', version: '2.2.0'
compile group: 'org.apache.sshd', name: 'sshd-sftp', version: '2.2.0'
compile group: 'org.apache.sshd', name: 'sshd-mina', version: '2.4.0'
compile group: 'org.apache.sshd', name: 'sshd-sftp', version: '2.4.0'
compile group: 'net.i2p.crypto', name: 'eddsa', version: '0.3.0'
compile group: 'com.google.guava', name: 'guava', version: '19.0'

Expand Down
2 changes: 1 addition & 1 deletion docs/_data/version.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
current: 3.0.4
current: 3.1.0
867 changes: 867 additions & 0 deletions docs/versions/3.1.0/javadoc-devel/allclasses-index.html

Large diffs are not rendered by default.

159 changes: 159 additions & 0 deletions docs/versions/3.1.0/javadoc-devel/allclasses.html

Large diffs are not rendered by default.

246 changes: 246 additions & 0 deletions docs/versions/3.1.0/javadoc-devel/allpackages-index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,246 @@
<!DOCTYPE HTML>
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc -->
<title>All Packages (xenon 3.1.0 API for Xenon developers)</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-3.3.1.js"></script>
<script type="text/javascript" src="jquery/jquery-migrate-3.0.1.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
</head>
<body>
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="All Packages (xenon 3.1.0 API for Xenon developers)";
}
}
catch(err) {
}
//-->
var pathtoroot = "./";
var useModuleDirectories = true;
loadScripts(document, 'script');</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
<header role="banner">
<nav role="navigation">
<div class="fixedNav">
<!-- ========= START OF TOP NAVBAR ======= -->
<div class="topNav"><a id="navbar.top">
<!-- -->
</a>
<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
<a id="navbar.top.firstrow">
<!-- -->
</a>
<ul class="navList" title="Navigation">
<li><a href="index.html">Overview</a></li>
<li>Package</li>
<li>Class</li>
<li><a href="overview-tree.html">Tree</a></li>
<li><a href="deprecated-list.html">Deprecated</a></li>
<li><a href="index-all.html">Index</a></li>
<li><a href="help-doc.html">Help</a></li>
</ul>
</div>
<div class="subNav">
<ul class="navList" id="allclasses_navbar_top">
<li><a href="allclasses.html">All&nbsp;Classes</a></li>
</ul>
<ul class="navListSearch">
<li><label for="search">SEARCH:</label>
<input type="text" id="search" value="search" disabled="disabled">
<input type="reset" id="reset" value="reset" disabled="disabled">
</li>
</ul>
<div>
<script type="text/javascript"><!--
allClassesLink = document.getElementById("allclasses_navbar_top");
if(window==top) {
allClassesLink.style.display = "block";
}
else {
allClassesLink.style.display = "none";
}
//-->
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
</div>
<a id="skip.navbar.top">
<!-- -->
</a></div>
<!-- ========= END OF TOP NAVBAR ========= -->
</div>
<div class="navPadding">&nbsp;</div>
<script type="text/javascript"><!--
$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
//-->
</script>
</nav>
</header>
<main role="main">
<div class="header">
<h1 title="All&amp;nbsp;Packages" class="title">All&nbsp;Packages</h1>
</div>
<div class="allPackagesContainer">
<ul class="blockList">
<li class="blockList">
<table class="packagesSummary">
<caption><span>Package Summary</span><span class="tabEnd">&nbsp;</span></caption>
<tr>
<th class="colFirst" scope="col">Package</th>
<th class="colLast" scope="col">Description</th>
</tr>
<tbody>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/package-summary.html">nl.esciencecenter.xenon</a></th>
<td class="colLast">
<div class="block">This package is the main entry point into the Xenon API.</div>
</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/adaptors/package-summary.html">nl.esciencecenter.xenon.adaptors</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/adaptors/filesystems/package-summary.html">nl.esciencecenter.xenon.adaptors.filesystems</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/adaptors/filesystems/ftp/package-summary.html">nl.esciencecenter.xenon.adaptors.filesystems.ftp</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/adaptors/filesystems/local/package-summary.html">nl.esciencecenter.xenon.adaptors.filesystems.local</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/adaptors/filesystems/sftp/package-summary.html">nl.esciencecenter.xenon.adaptors.filesystems.sftp</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/adaptors/filesystems/webdav/package-summary.html">nl.esciencecenter.xenon.adaptors.filesystems.webdav</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/adaptors/schedulers/package-summary.html">nl.esciencecenter.xenon.adaptors.schedulers</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/adaptors/schedulers/at/package-summary.html">nl.esciencecenter.xenon.adaptors.schedulers.at</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/adaptors/schedulers/gridengine/package-summary.html">nl.esciencecenter.xenon.adaptors.schedulers.gridengine</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/adaptors/schedulers/local/package-summary.html">nl.esciencecenter.xenon.adaptors.schedulers.local</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/adaptors/schedulers/slurm/package-summary.html">nl.esciencecenter.xenon.adaptors.schedulers.slurm</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/adaptors/schedulers/ssh/package-summary.html">nl.esciencecenter.xenon.adaptors.schedulers.ssh</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/adaptors/schedulers/torque/package-summary.html">nl.esciencecenter.xenon.adaptors.schedulers.torque</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/adaptors/shared/ssh/package-summary.html">nl.esciencecenter.xenon.adaptors.shared.ssh</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/credentials/package-summary.html">nl.esciencecenter.xenon.credentials</a></th>
<td class="colLast">
<div class="block">This package contains classes and interfaces for managing credentials.</div>
</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/filesystems/package-summary.html">nl.esciencecenter.xenon.filesystems</a></th>
<td class="colLast">
<div class="block">This package contains classes and interfaces for manipulating files.</div>
</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/schedulers/package-summary.html">nl.esciencecenter.xenon.schedulers</a></th>
<td class="colLast">
<div class="block">This package contains the classes and interfaces used to run jobs.</div>
</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="nl/esciencecenter/xenon/utils/package-summary.html">nl.esciencecenter.xenon.utils</a></th>
<td class="colLast">
<div class="block">This package is contains several utility classes.</div>
</td>
</tr>
</tbody>
</table>
</li>
</ul>
</div>
</main>
<footer role="contentinfo">
<nav role="navigation">
<!-- ======= START OF BOTTOM NAVBAR ====== -->
<div class="bottomNav"><a id="navbar.bottom">
<!-- -->
</a>
<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
<a id="navbar.bottom.firstrow">
<!-- -->
</a>
<ul class="navList" title="Navigation">
<li><a href="index.html">Overview</a></li>
<li>Package</li>
<li>Class</li>
<li><a href="overview-tree.html">Tree</a></li>
<li><a href="deprecated-list.html">Deprecated</a></li>
<li><a href="index-all.html">Index</a></li>
<li><a href="help-doc.html">Help</a></li>
</ul>
</div>
<div class="subNav">
<ul class="navList" id="allclasses_navbar_bottom">
<li><a href="allclasses.html">All&nbsp;Classes</a></li>
</ul>
<div>
<script type="text/javascript"><!--
allClassesLink = document.getElementById("allclasses_navbar_bottom");
if(window==top) {
allClassesLink.style.display = "block";
}
else {
allClassesLink.style.display = "none";
}
//-->
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
</div>
<a id="skip.navbar.bottom">
<!-- -->
</a></div>
<!-- ======== END OF BOTTOM NAVBAR ======= -->
</nav>
</footer>
</body>
</html>
Loading

0 comments on commit 8457939

Please sign in to comment.