Skip to content

Commit 5b69e45

Browse files
author
Vasileios Karakasis
committed
Revert changes related to configuration
- Node lists are always abbreviated in the `FAILURE INFO` output but not in the JSON report.
1 parent f13e166 commit 5b69e45

File tree

5 files changed

+5
-29
lines changed

5 files changed

+5
-29
lines changed

reframe/core/schedulers/__init__.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ def __init__(self,
201201
self._exitcode = None
202202
self._state = None
203203
self._nodelist = None
204-
self._hostlist = None
205204
self._submit_time = None
206205
self._completion_time = None
207206

@@ -327,18 +326,6 @@ def nodelist(self):
327326
'''
328327
return self._nodelist
329328

330-
@property
331-
def hostlist(self):
332-
'''The hostlist of this job.
333-
334-
The value of this field is scheduler-specific.
335-
336-
.. versionadded:: 3.6
337-
338-
:type: :class`str` or :class:`None`
339-
'''
340-
return self._hostlist
341-
342329
@property
343330
def submit_time(self):
344331
return self._submit_time

reframe/core/schedulers/slurm.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,9 +368,7 @@ def _update_nodelist(self, job, nodespec):
368368

369369
if nodespec and nodespec != 'None assigned':
370370
job._nodelist = [n.name for n in self._get_nodes_by_name(nodespec)]
371-
if rt.runtime().get_option('general/0/report_hostlist'):
372-
job._hostlist = nodespec
373-
371+
374372
def _update_completion_time(self, job, timestamps):
375373
if job._completion_time is not None:
376374
return

reframe/frontend/cli.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -450,13 +450,6 @@ def main():
450450
action='store_true',
451451
help='Use a login shell for job scripts'
452452
)
453-
argparser.add_argument(
454-
dest='report_hostlist',
455-
envvar='RFM_REPORT_HOSTLIST',
456-
configvar='general/report_hostlist',
457-
action='store_true',
458-
help='Use hostlist format to report nodelist'
459-
)
460453

461454
# Parse command line
462455
options = argparser.parse_args()

reframe/frontend/statistics.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import traceback
88
import reframe.core.runtime as rt
99
import reframe.core.exceptions as errors
10+
import reframe.utility as util
1011

1112

1213
class TestStats:
@@ -112,7 +113,6 @@ def json(self, force=False):
112113
'maintainers': check.maintainers,
113114
'name': check.name,
114115
'nodelist': [],
115-
'hostlist': None,
116116
'outputdir': None,
117117
'perfvars': None,
118118
'result': None,
@@ -141,7 +141,6 @@ def json(self, force=False):
141141
entry['job_stderr'] = check.stderr.evaluate()
142142
entry['job_stdout'] = check.stdout.evaluate()
143143
entry['nodelist'] = check.job.nodelist or []
144-
entry['hostlist'] = check.job.hostlist or ''
145144

146145
if check.build_job:
147146
entry['build_stderr'] = check.build_stderr.evaluate()
@@ -218,8 +217,9 @@ def print_failure_report(self, printer):
218217
printer.info(f" * System partition: {r['system']}")
219218
printer.info(f" * Environment: {r['environment']}")
220219
printer.info(f" * Stage directory: {r['stagedir']}")
221-
nodelist = ','.join(r['nodelist']) if r['nodelist'] else None
222-
printer.info(f" * Node list: {nodelist}")
220+
printer.info(
221+
f" * Node list: {util.nodelist_abbrev(r['nodelist'])}"
222+
)
223223
job_type = 'local' if r['scheduler'] == 'local' else 'batch job'
224224
jobid = r['jobid']
225225
printer.info(f" * Job type: {job_type} (id={r['jobid']})")

reframe/schemas/config.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,6 @@
448448
"non_default_craype": {"type": "boolean"},
449449
"purge_environment": {"type": "boolean"},
450450
"report_file": {"type": "string"},
451-
"report_hostlist": {"type": "boolean"},
452451
"save_log_files": {"type": "boolean"},
453452
"target_systems": {"$ref": "#/defs/system_ref"},
454453
"timestamp_dirs": {"type": "string"},
@@ -487,7 +486,6 @@
487486
"general/non_default_craype": false,
488487
"general/purge_environment": false,
489488
"general/report_file": "${HOME}/.reframe/reports/run-report.json",
490-
"general/report_hostlist": false,
491489
"general/save_log_files": false,
492490
"general/target_systems": ["*"],
493491
"general/timestamp_dirs": "",

0 commit comments

Comments
 (0)