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

test: limit temp dhcp6 changes to < NOBLE #4942

Merged
merged 1 commit into from
Feb 23, 2024

Conversation

TheRealFalcon
Copy link
Member

Proposed Commit Message

test: limit temp dhcp6 changes to < NOBLE

#4474 landed in Noble, so this block isn't needed.

Additional Context

https://jenkins.canonical.com/server-team/view/cloud-init/job/cloud-init-integration-noble-gce/49/testReport/junit/tests.integration_tests/test_upgrade/test_clean_boot_of_upgraded_package/

Merge type

  • Squash merge using "Proposed Commit Message"
  • Rebase and merge unique commits. Requires commit messages per-commit each referencing the pull request number (#<PR_NUM>)

canonical#4474 landed in Noble, so this block isn't needed.
@a-dubs
Copy link
Collaborator

a-dubs commented Feb 22, 2024

Nice catch! Looks good. My eyes don't work too well tho...

@blackboxsw
Copy link
Collaborator

blackboxsw commented Feb 22, 2024

@TheRealFalcon @holmanb don't we need to patch #4474 behavior related to dhcp6: true in network config from generate_fallback_config to avoid change in behavior on stable releases? I see no applicable quilt patches in our ubuntu/* branches to limit this behavior to just NOBLE.

@TheRealFalcon
Copy link
Member Author

Is there reason to think this would break anything? I didn't think we needed to patch this one.

@blackboxsw
Copy link
Collaborator

Is there reason to think this would break anything? I didn't think we needed to patch this one.

As long as our rendered network config definition is not blocking/waiting indefinitely on marking the network interface "up" on having a viable dhcp6 route/response from the DHCP server, then it shouldn't impact anything such as boot time while we await for network-online.target.

@TheRealFalcon
Copy link
Member Author

not blocking/waiting indefinitely on marking the network interface "up"

Yeah, that's a valid concern. I initially reverted this one because it would cause exactly that on NetworkManager, but we were able to get that fixed in a follow-up to #4474

Copy link
Contributor

@aciba90 aciba90 left a comment

Choose a reason for hiding this comment

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

LGTM!

@blackboxsw
Copy link
Collaborator

blackboxsw commented Feb 23, 2024

Thanks for this. I found the supplemental commit that fixed this issue for NetworkManager rendered config 29dd5ac. And also confirmed that on systemd-networkd environments rendered from netplan config, we don't see issues with timing in environments with no dhcp6 provided from the dhcp service with /run/systemd/network/*.network config setting [Network]\nDHCP=yes which is generated due to dhcp6 and dhcp4 vs just DHCP=ipv4 which is rendered when we only specific dhcp4: true config in netplan.

I approve that it doesn't appear we need to stub out or disable this behavior on stable releases given the fix that already landed relative to NM, networkd and netplan rendering will be rendered with DHCP=yes when both dhcp6 and dhcp4 config is requested. This change doesn't appear to introduce boot-time cost when comparing multiple runs with and without dhcp6 config requested when the DHCP service doesn't provide and DHCPv6 config.

@TheRealFalcon TheRealFalcon merged commit e8c2eaf into canonical:main Feb 23, 2024
29 checks passed
@TheRealFalcon TheRealFalcon deleted the test-gce-noble branch February 23, 2024 21:18
blackboxsw pushed a commit that referenced this pull request Feb 27, 2024
#4474 landed in Noble, so this block isn't needed.
blackboxsw pushed a commit that referenced this pull request Feb 27, 2024
#4474 landed in Noble, so this block isn't needed.
blackboxsw pushed a commit that referenced this pull request Feb 27, 2024
#4474 landed in Noble, so this block isn't needed.
holmanb pushed a commit to holmanb/cloud-init that referenced this pull request Mar 5, 2024
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.

4 participants