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

e2e: Ensure Consul client is running before starting Nomad service. #24964

Merged
merged 1 commit into from
Jan 28, 2025

Conversation

jrasell
Copy link
Member

@jrasell jrasell commented Jan 28, 2025

The recent change of the Consul fingerprinter means Consul must be up and started before the Nomad client, otherwise the Nomad process needs to be sent a SIGHUP.

Contributor Checklist

  • Changelog Entry If this PR changes user-facing behavior, please generate and add a
    changelog entry using the make cl command.
  • Testing Please add tests to cover any new functionality or to demonstrate bug fixes and
    ensure regressions will be caught.
  • Documentation If the change impacts user-facing functionality such as the CLI, API, UI,
    and job configuration, please update the Nomad website documentation to reflect this. Refer to
    the website README for docs guidelines. Please also consider whether the
    change requires notes within the upgrade guide.

Reviewer Checklist

  • Backport Labels Please add the correct backport labels as described by the internal
    backporting document.
  • Commit Type Ensure the correct merge method is selected which should be "squash and merge"
    in the majority of situations. The main exceptions are long-lived feature branches or merges where
    history should be preserved.
  • Enterprise PRs If this is an enterprise only PR, please add any required changelog entry
    within the public repository.

Copy link
Member

@tgross tgross left a comment

Choose a reason for hiding this comment

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

It looks like as of hashicorp/consul#16845 Consul supports systemd Type=notify and that's actually now part of their packaged unit file: https://github.com/hashicorp/consul/blob/main/.release/linux/package/usr/lib/systemd/system/consul.service#L9 We're not using that unit file (for reasons which were probably good at the time but may not make sense anymore). That should allow depends/wants to work correctly.

@jrasell jrasell force-pushed the b-e2e-deplay-client-nomad-service-for-consul branch from 77a79fc to 727f931 Compare January 28, 2025 14:33
@jrasell jrasell changed the title e2e: add small delay between starting Consul and Nomad on clients. e2e: Ensure Consul client is running before starting Nomad service. Jan 28, 2025
@jrasell jrasell requested a review from tgross January 28, 2025 14:34
Copy link
Member

@tgross tgross left a comment

Choose a reason for hiding this comment

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

LGTM!

@jrasell jrasell merged commit 8859cfa into main Jan 28, 2025
10 of 11 checks passed
@jrasell jrasell deleted the b-e2e-deplay-client-nomad-service-for-consul branch January 28, 2025 15:28
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.

2 participants