Skip to content

Commit 95f61d2

Browse files
authored
Merge pull request #15 from michellab/bugfix-robust-slurm-queue-read
Bugfix robust slurm queue read
2 parents 4cbfe4a + ae17592 commit 95f61d2

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

a3fe/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.2.0"
1+
__version__ = "0.2.1"

a3fe/run/_virtual_queue.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,9 @@ def _read_slurm_queue_inner() -> _List[int]:
201201
"""This inner function is defined so that we can pass self._logger
202202
to the decorator"""
203203
# Get job ids of currently running jobs. This assumes no array jobs.
204+
# Only read running, pending, suspended, and completing jobs (R, PD, S, CG).
204205
commands = [
205-
["squeue", "-h", "-u", _getpass.getuser()],
206+
["squeue", "-h", "-u", _getpass.getuser(), "-t", "R,PD,S,CG"],
206207
["awk", "{print $1}"],
207208
["grep", "-v", "-E", "'\\[|_'"],
208209
["paste", "-s", "-d,", "-"],

docs/CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
Change Log
33
===============
44

5+
0.2.1
6+
====================
7+
8+
- Fixed issue https://github.com/michellab/a3fe/issues/14 where all jobs in the slurm queue were assumed to be
9+
pending or running. This caused problems when completed jobs remained in the queue.
10+
511
0.2.0
612
====================
713

0 commit comments

Comments
 (0)