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.

Sign up for GitHub

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

Jump to bottom

Fix race between sled-agent and zone-setup service #6152

Merged
merged 2 commits into from
Jul 25, 2024
Merged

Fix race between sled-agent and zone-setup service #6152

merged 2 commits into from
Jul 25, 2024

Commits on Jul 25, 2024

  1. Fix race between sled-agent and zone-setup service 

    - Fixes #6149
- Most zones run the `zone-network-setup` once, at startup, with their
  underlay addresses already provided by the sled-agent. That's not true
  for the switch zone, which starts with only a localhost address, and
  then is provided an underlay address by the sled-agent only after the
  bootstrapping process has proceededed further. However, the
  zone-setup-service previously deleted its IP interfaces prior to
  setting the underlay address on it, apparently as a workaround for
  oxidecomputer/stlouis#435. That's fine for
  other zones, but that races with the sled-agent setting that underlay
  address later in the switch zone. It's possible for the
  zone-setup-service to delete the interface _after_ those addresses are
  set, which obviously prevents the rest of the control plane from
  deploying correctly. This fixes the issue by simply removing that call
  to `ipadm delete-if` in the zone-setup-service. The mentioned issue
  has been resolved, and the workaround is no longer needed.
- Move the `zone-network-setup` service depend on the network milestone,
  instead of multi-user. This just moves it earlier a bit in the
  dependency graph, though should not be strictly necessary. We might
  want to move the sled-agent's notion of "zone readiness" to depend on
  `multi-user` instead of `single-user` in the future, so this could
  help with that.
- Extract out a few constants, some whitespace cleanup
    @bnaecker
    bnaecker committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    f7d80f1 View commit details
    Browse the repository at this point in the history

  2. Review feedback 

    - Addrobj name typo
- Cleanup zone setup manifest
    @bnaecker
    bnaecker committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    6c93f59 View commit details
    Browse the repository at this point in the history