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

actions: fudge /etc/hosts #4176

Merged
merged 9 commits into from
Apr 20, 2021
Merged

Conversation

oliver-sanders
Copy link
Member

@oliver-sanders oliver-sanders commented Apr 16, 2021

  • Patch the broken GH DNS
  • (bug) Fix cylc message so that it doesn't attempt to send TCP messages when communication method = poll.
  • Add timeout to bash workflow.
  • Pin pytest-asyncio to 0.14 due to an unresolved bug.
  • Fix misclassified functional test.
  • Fix tests which were broken for comms:poll.
  • Some fiddling to get the tests passing again.
  • Update exception code change in shellcheck 0.7.2 (mac os is picking up the latest)

Requirements 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).
  • Test includes.
  • No changelog.
  • No documentation.
  • No dependency changes.

@oliver-sanders oliver-sanders marked this pull request as draft April 16, 2021 10:55
@oliver-sanders oliver-sanders self-assigned this Apr 16, 2021
@MetRonnie
Copy link
Member

I've just noticed the bash test workflow has no timeout, so it might be worth adding while you're at it

diff --git a/.github/workflows/bash.yml b/.github/workflows/bash.yml
index 3ebfc086c..ebd791ed2 100644
--- a/.github/workflows/bash.yml
+++ b/.github/workflows/bash.yml
@@ -10,6 +10,7 @@ on:
 jobs:
   bash-docker:
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     strategy:
       matrix:
         bash-version:

* ask the host for its names then use those to configure /etc/hosts
* nasty hack to deal with broken DNS on GH actions
* actions/runner-images#3185
* skip tcp comms if comms method == poll
* convert comms method to enum
@oliver-sanders oliver-sanders mentioned this pull request Apr 16, 2021
4 tasks
* wait for long enough for the started message to get picked up by the
  scheduler
* this test was passing before because it wasn't testing polling
  properly (because poll task comms was attempting TCP comms anyway)
* test was not suitible for use with polling task comms
@oliver-sanders oliver-sanders marked this pull request as ready for review April 19, 2021 22:32

comms_method = get_comms_method()
return get_runtime_client(comms_method, workflow, timeout=timeout)
return get_runtime_client(get_comms_method(), workflow, timeout=timeout)
Copy link
Member

Choose a reason for hiding this comment

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

This seems like a function that doesn't need to exist! Merge with the previous one?

Copy link
Member

@hjoliver hjoliver left a comment

Choose a reason for hiding this comment

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

Looks good, tests all passing. It seems actions/runner-images#3185 has been acknowledged as a bug, so we shouldn't need the fudge for long.

@oliver-sanders
Copy link
Member Author

The rollout has started but only hit a small subset of customers. It should finish completely before the end of this week.

🍾

@oliver-sanders oliver-sanders added this to the cylc-8.0b1 milestone Apr 20, 2021
@oliver-sanders oliver-sanders requested review from MetRonnie and datamel and removed request for MetRonnie April 20, 2021 08:21
@oliver-sanders
Copy link
Member Author

oliver-sanders commented Apr 20, 2021

@datamel could you make sure you are happy with the comms code changes.

(I removed the CommsMode.LOCAL as the host name is included in the metadata)

@oliver-sanders oliver-sanders added the bug Something is wrong :( label Apr 20, 2021
Copy link
Contributor

@datamel datamel left a comment

Choose a reason for hiding this comment

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

Looks good, I have added a suggestion for logging.

cylc/flow/network/client.py Outdated Show resolved Hide resolved
Co-authored-by: Melanie Hall <37735232+datamel@users.noreply.github.com>
@oliver-sanders oliver-sanders mentioned this pull request Apr 20, 2021
7 tasks
@oliver-sanders
Copy link
Member Author

Going in with two approvals before any more unrelated bugs show up!

@oliver-sanders oliver-sanders merged commit 010c523 into cylc:master Apr 20, 2021
@oliver-sanders oliver-sanders deleted the mod-etc-hosts branch April 20, 2021 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something is wrong :(
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants