Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove 'extra log files' from config #3969

Merged
merged 3 commits into from
Dec 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions cylc/flow/cfgspec/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -778,17 +778,7 @@
* :cylc:conf:`[..]exit-script`

''')
Conf('extra log files', VDR.V_STRING_LIST, desc='''
A list of user-defined log files associated with a task. Log
files must reside in the job log directory
``$CYLC_TASK_LOG_DIR`` and ideally should be named using the
``$CYLC_TASK_LOG_ROOT`` prefix (see :ref:`Task Job Script
Variables`).

Example:

``job.custom-log-name``
''')
Conf('work sub-directory', VDR.V_STRING, desc='''
Task job scripts are executed from within *work directories*
created automatically under the suite run directory. A task
Expand Down Expand Up @@ -1324,8 +1314,9 @@ def upg(cfg, descr):
u.obsolete(
'8.0.0',
['cylc', 'health check interval'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'job', 'shell'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'events', 'mail retry delays'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'extra log files'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'job', 'shell'])
u.obsolete('8.0.0', ['cylc', 'abort if any task fails'])
u.obsolete('8.0.0', ['cylc', 'events', 'abort if any task fails'])
u.obsolete('8.0.0', ['cylc', 'events', 'mail retry delays'])
Expand Down
5 changes: 0 additions & 5 deletions cylc/flow/job_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"""
from copy import deepcopy
import json
import os
from time import time

from cylc.flow import LOG, ID_DELIM
Expand Down Expand Up @@ -159,10 +158,6 @@ def insert_db_job(self, row_idx, row):
poverride(rtconfig, overrides, prepend=True)
else:
rtconfig = tdef.rtconfig
j_buf.extra_logs.extend(
[os.path.expanduser(os.path.expandvars(log_file))
for log_file in rtconfig['extra log files']]
)
except SuiteConfigError:
LOG.exception((
'ignoring job %s from the suite run database\n'
Expand Down
4 changes: 0 additions & 4 deletions cylc/flow/scripts/cat_log.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
'[JOB-HOST]retrieve job logs = True') and the job is not currently running, the
local (retrieved) log will be accessed unless '-o/--force-remote' is used.

Custom job logs (written to $CYLC_TASK_LOG_DIR on the job host) can be
listed in 'extra log files' in the suite definition. The file
name must be given, but can be discovered with '--mode=l' (list-dir).

The correct cycle point format of the suite must be used for task job logs,
but can be discovered with '--mode=d' (print-dir).

Expand Down
3 changes: 0 additions & 3 deletions cylc/flow/task_job_mgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -943,9 +943,6 @@ def _prep_submit_task_job_impl(self, suite, itask, rtconfig):
itask.submit_num] = itask.platform['name']

itask.summary['batch_sys_name'] = itask.platform['batch system']
for name in rtconfig['extra log files']:
itask.summary['logfiles'].append(
os.path.expanduser(os.path.expandvars(name)))
try:
batch_sys_conf = self.task_events_mgr.get_host_conf(
itask, 'batch systems')[itask.summary['batch_sys_name']]
Expand Down
2 changes: 0 additions & 2 deletions tests/flakyfunctional/events/01-task/flow.cylc
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
"""
[runtime]
[[root]]
# make the event handler log available to gcylc:
extra log files = {{ EVNTLOG }}
script = "true" # fast

[[prep]]
Expand Down
13 changes: 0 additions & 13 deletions tests/functional/cylc-get-config/00-simple/section2.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
pre-script =
script =
post-script =
extra log files =
work sub-directory =
[[[meta]]]
title =
Expand Down Expand Up @@ -86,7 +85,6 @@
exit-script =
pre-script =
post-script =
extra log files =
work sub-directory =
[[[meta]]]
title =
Expand Down Expand Up @@ -164,7 +162,6 @@
exit-script =
pre-script =
post-script =
extra log files =
work sub-directory =
[[[meta]]]
title =
Expand Down Expand Up @@ -242,7 +239,6 @@
pre-script =
script =
post-script =
extra log files =
work sub-directory =
[[[directives]]]
job_type = serial
Expand Down Expand Up @@ -321,7 +317,6 @@
pre-script =
script =
post-script =
extra log files =
work sub-directory =
[[[directives]]]
job_type = parallel
Expand Down Expand Up @@ -400,7 +395,6 @@
exit-script =
pre-script =
post-script =
extra log files =
work sub-directory =
[[[directives]]]
job_type = serial
Expand Down Expand Up @@ -479,7 +473,6 @@
exit-script =
pre-script =
post-script =
extra log files =
work sub-directory =
[[[directives]]]
job_type = serial
Expand Down Expand Up @@ -558,7 +551,6 @@
exit-script =
pre-script =
post-script =
extra log files =
work sub-directory =
[[[directives]]]
job_type = parallel
Expand Down Expand Up @@ -637,7 +629,6 @@
exit-script =
pre-script =
post-script =
extra log files =
work sub-directory =
[[[directives]]]
job_type = parallel
Expand Down Expand Up @@ -716,7 +707,6 @@
exit-script =
pre-script =
post-script =
extra log files =
work sub-directory =
[[[directives]]]
job_type = serial
Expand Down Expand Up @@ -795,7 +785,6 @@
exit-script =
pre-script =
post-script =
extra log files =
work sub-directory =
[[[directives]]]
job_type = serial
Expand Down Expand Up @@ -874,7 +863,6 @@
exit-script =
pre-script =
post-script =
extra log files =
work sub-directory =
[[[directives]]]
job_type = parallel
Expand Down Expand Up @@ -953,7 +941,6 @@
exit-script =
pre-script =
post-script =
extra log files =
work sub-directory =
[[[directives]]]
job_type = parallel
Expand Down
1 change: 1 addition & 0 deletions tests/functional/deprecations/01-cylc8-basic/flow.cylc
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

[runtime]
[[foo, cat, dog]]
extra log files =
[[[job]]]
shell = fish
[[[events]]]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ WARNING - * (8.0.0) [cylc][force run mode] - DELETED (OBSOLETE)
WARNING - * (8.0.0) [cylc][authentication] - DELETED (OBSOLETE)
WARNING - * (8.0.0) [cylc][log resolved dependencies] - DELETED (OBSOLETE)
WARNING - * (8.0.0) [cylc][required run mode] - DELETED (OBSOLETE)
WARNING - * (8.0.0) [runtime][foo, cat, dog][job][shell] - DELETED (OBSOLETE)
WARNING - * (8.0.0) [runtime][foo, cat, dog][events][mail retry delays] - DELETED (OBSOLETE)
WARNING - * (8.0.0) [runtime][foo, cat, dog][extra log files] - DELETED (OBSOLETE)
WARNING - * (8.0.0) [runtime][foo, cat, dog][job][shell] - DELETED (OBSOLETE)
WARNING - * (8.0.0) [cylc][abort if any task fails] - DELETED (OBSOLETE)
WARNING - * (8.0.0) [cylc][disable automatic shutdown] - DELETED (OBSOLETE)
WARNING - * (8.0.0) [cylc][reference test] - DELETED (OBSOLETE)
Expand Down
1 change: 0 additions & 1 deletion tests/functional/graphql/02-root-queries/flow.cylc
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ baa => qaz
trigger1 = "data ready"

[[baa]]
extra log files = $HOME/startrek/captains.log
[[[meta]]]
description = "some task baa"
[[[environment]]]
Expand Down