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

cat-log: fix file listing errors #5514

Merged
merged 1 commit into from
May 4, 2023
Merged

Conversation

oliver-sanders
Copy link
Member

@oliver-sanders oliver-sanders commented May 3, 2023

  • Include job-activity.log file if present even if listing is remote.
  • List local files for submission-failed tasks.

Check List

  • I have read CONTRIBUTING.md and added my name as a Code Contributor.
  • Contains logically grouped changes (else tidy your branch by rebase).
  • Does not contain off-topic changes (use other PRs for other changes).
  • Applied any dependency changes to both setup.cfg (and conda-environment.yml if present).
  • Tests are included (or explain why tests are not needed).
  • CHANGES.md entry included if this is a change that can affect users
  • Cylc-Doc pull request opened if required at cylc/cylc-doc/pull/XXXX.
  • If this is a bug fix, PR should be raised against the relevant ?.?.x branch.

@oliver-sanders oliver-sanders added this to the cylc-8.1.4 milestone May 3, 2023
@oliver-sanders oliver-sanders self-assigned this May 3, 2023
@@ -261,18 +261,18 @@ def view_log(
# Print location even if the workflow does not exist yet.
print(logpath)
return 0
if not os.path.exists(logpath) and batchview_cmd is None:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The logpath contains the filename (defaults to job.out) even if it was not specified, even if we are listing a directory.

Consequently this caused failures when listing remote directories where the job.out file was not present.

@oliver-sanders oliver-sanders changed the title cat-log: cat-log: fix file listing errors May 4, 2023
@oliver-sanders oliver-sanders marked this pull request as ready for review May 4, 2023 09:38
@oliver-sanders oliver-sanders requested review from MetRonnie and wxtim May 4, 2023 09:38
Copy link
Member

@wxtim wxtim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Read and understood
  • Tried (to break) it locally

@wxtim
Copy link
Member

wxtim commented May 4, 2023

Please hang fire until I've checked that this all works with the GUI.

Checked with GUI - I don't know what was wrong with my GUI locally, but I'm now satisfied that problems I was having are unrelated to this PR>

@wxtim wxtim self-requested a review May 4, 2023 10:21
* Include job-activity.log file if present even if listing is remote.
* List local files for submission-failed tasks.
Copy link
Member

@MetRonnie MetRonnie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awaiting tests

@oliver-sanders
Copy link
Member Author

One functional test failure: tests/f/platforms/10-platform-gone-on-restart.t

(known to be flaky)

@wxtim wxtim merged commit 66794d1 into cylc:8.1.x May 4, 2023
@oliver-sanders oliver-sanders deleted the cat-log-fixes branch May 4, 2023 12:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants