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

OCPBUGS-29659: Apply new DNS configuration only if changed #4196

Merged

Conversation

mkowalski
Copy link
Contributor

@mkowalski mkowalski commented Feb 19, 2024

With this change the resolv-prepender script will apply DNS changes only when DNS servers actually changed. This will significantly reduce the number of nmcli calls and remove scenarios in which we can end up in the infinite loop of resolv-prepender calls.

Fixes: OPNET-469
Relates-to: OCPBUGS-29624

With this change the resolv-prepender script will apply DNS changes only
when DNS servers actually changed. This will significantly reduce the
number of `nmcli` calls and remove scenarios in which we can end up in
the infinite loop of resolv-prepender calls.

Fixes: OPNET-469
Relates-to: OCPBUGS-29624
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 19, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 19, 2024

@mkowalski: This pull request references OPNET-469 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.16.0" version, but no target version was set.

In response to this:

With this change the resolv-prepender script will apply DNS changes only when DNS servers actually changed. This will significantly reduce the number of nmcli calls and remove scenarios in which we can end up in the infinite loop of resolv-prepender calls.

Fixes: OPNET-469
Relates-to: OCPBUGS-29624

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

1 similar comment
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 19, 2024

@mkowalski: This pull request references OPNET-469 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.16.0" version, but no target version was set.

In response to this:

With this change the resolv-prepender script will apply DNS changes only when DNS servers actually changed. This will significantly reduce the number of nmcli calls and remove scenarios in which we can end up in the infinite loop of resolv-prepender calls.

Fixes: OPNET-469
Relates-to: OCPBUGS-29624

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@derekhiggins
Copy link

/payload periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-ovn-ipv6

Copy link
Contributor

openshift-ci bot commented Feb 19, 2024

@derekhiggins: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@derekhiggins
Copy link

/payload-job periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-ovn-ipv6

Copy link
Contributor

openshift-ci bot commented Feb 19, 2024

@derekhiggins: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/e6419c70-cf10-11ee-86dd-744eba21971c-0

@mkowalski
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 19, 2024

@mkowalski: This pull request references OPNET-469 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.16.0" version, but no target version was set.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@mkowalski
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 19, 2024

@mkowalski: This pull request references OPNET-469 which is a valid jira issue.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@mkowalski mkowalski changed the title OPNET-469: Apply new DNS configuration only if changed OCPBUGS-29659: Apply new DNS configuration only if changed Feb 19, 2024
@mkowalski
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@mkowalski: This pull request references Jira Issue OCPBUGS-29659, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

In response to this:

With this change the resolv-prepender script will apply DNS changes only when DNS servers actually changed. This will significantly reduce the number of nmcli calls and remove scenarios in which we can end up in the infinite loop of resolv-prepender calls.

Fixes: OPNET-469
Relates-to: OCPBUGS-29624

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Feb 19, 2024
@openshift-ci-robot
Copy link
Contributor

@mkowalski: This pull request references Jira Issue OCPBUGS-29659, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@mkowalski
Copy link
Contributor Author

/payload-job periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-ovn-ipv6

Let's run 10 times and see the statistic. Right now 1 run, 1 success

Copy link
Contributor

openshift-ci bot commented Feb 19, 2024

@mkowalski: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/bd14f6d0-cf38-11ee-8618-ae39fd373974-0

@derekhiggins
Copy link

derekhiggins commented Feb 19, 2024

Let's run 10 times and see the statistic. Right now 1 run, 1 success

10 times will take 2 days, minimum, it seems like this PR is worth merging either way? we could just merge and observe if the situation improves.

@cybertron
Copy link
Member

/test e2e-openstack
/test e2e-metal-ipi-ovn-ipv6

lgtm assuming the ci jobs pass

@mkowalski
Copy link
Contributor Author

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Feb 19, 2024
@sinnykumari
Copy link
Contributor

Adding approval to unblock team.
/approve
Putting hold for now, once required tests are passing feel free to remove hold
/hold

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 19, 2024
@mkowalski
Copy link
Contributor Author

/retest-required

@mkowalski
Copy link
Contributor Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 20, 2024
@cybertron
Copy link
Member

/test e2e-openstack
/test e2e-metal-ipi
/lgtm
/hold

Would still like to see this pass an ipv4 on-prem job. I can see that resolv.conf was populated correctly in the openstack job so I don't think that failure is related to this patch. Once we get a pass from one of these jobs feel free to remove the hold.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 20, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 20, 2024
Copy link
Contributor

openshift-ci bot commented Feb 20, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cybertron, mkowalski, sinnykumari

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@stbenjam
Copy link
Member

/hold cancel

After discussing on Slack we want to land this ASAP

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 20, 2024
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD f799d7f and 2 for PR HEAD de16a87 in total

Copy link
Contributor

openshift-ci bot commented Feb 20, 2024

@mkowalski: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-metal-ipi de16a87 link false /test e2e-metal-ipi
ci/prow/e2e-openstack de16a87 link false /test e2e-openstack

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 78a7967 into openshift:master Feb 20, 2024
16 of 19 checks passed
@openshift-ci-robot
Copy link
Contributor

@mkowalski: Jira Issue OCPBUGS-29659: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-29659 has been moved to the MODIFIED state.

In response to this:

With this change the resolv-prepender script will apply DNS changes only when DNS servers actually changed. This will significantly reduce the number of nmcli calls and remove scenarios in which we can end up in the infinite loop of resolv-prepender calls.

Fixes: OPNET-469
Relates-to: OCPBUGS-29624

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

cybertron added a commit to cybertron/machine-config-operator that referenced this pull request Feb 20, 2024
PR openshift#4196 made this conditional based on whether changes were
actually made to resolv.conf. Unfortunately, because resolv.conf is
persistent over reboots this means that we never touch it after the
initial deployment and as a result on subsequent boots kubelet will
never start because the file is never created.

Because we don't care whether changes were actually made, only that
resolv.conf is correctly generated, we can move this file creation
out of the if block and always do it to fix the problem.

Note that this probably does not happen with OVNKubernetes because
the creation of br-ex triggers DNS changes (it gets cleared and then
re-populated) so this is only relevant for OpenShiftSDN-based envs.
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-machine-config-operator-container-v4.16.0-202402210139.p0.g78a7967.assembly.stream.el8 for distgit ose-machine-config-operator.
All builds following this will include this PR.

@mkowalski mkowalski deleted the nm-dns-emiter-fix-diff branch February 21, 2024 08:56
@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.16.0-0.nightly-2024-02-22-021321

mkowalski pushed a commit to mkowalski/machine-config-operator that referenced this pull request Feb 27, 2024
PR openshift#4196 made this conditional based on whether changes were
actually made to resolv.conf. Unfortunately, because resolv.conf is
persistent over reboots this means that we never touch it after the
initial deployment and as a result on subsequent boots kubelet will
never start because the file is never created.

Because we don't care whether changes were actually made, only that
resolv.conf is correctly generated, we can move this file creation
out of the if block and always do it to fix the problem.

Note that this probably does not happen with OVNKubernetes because
the creation of br-ex triggers DNS changes (it gets cleared and then
re-populated) so this is only relevant for OpenShiftSDN-based envs.
mkowalski pushed a commit to mkowalski/machine-config-operator that referenced this pull request Mar 4, 2024
PR openshift#4196 made this conditional based on whether changes were
actually made to resolv.conf. Unfortunately, because resolv.conf is
persistent over reboots this means that we never touch it after the
initial deployment and as a result on subsequent boots kubelet will
never start because the file is never created.

Because we don't care whether changes were actually made, only that
resolv.conf is correctly generated, we can move this file creation
out of the if block and always do it to fix the problem.

Note that this probably does not happen with OVNKubernetes because
the creation of br-ex triggers DNS changes (it gets cleared and then
re-populated) so this is only relevant for OpenShiftSDN-based envs.
dkhater-redhat pushed a commit to dkhater-redhat/machine-config-operator that referenced this pull request Mar 8, 2024
PR openshift#4196 made this conditional based on whether changes were
actually made to resolv.conf. Unfortunately, because resolv.conf is
persistent over reboots this means that we never touch it after the
initial deployment and as a result on subsequent boots kubelet will
never start because the file is never created.

Because we don't care whether changes were actually made, only that
resolv.conf is correctly generated, we can move this file creation
out of the if block and always do it to fix the problem.

Note that this probably does not happen with OVNKubernetes because
the creation of br-ex triggers DNS changes (it gets cleared and then
re-populated) so this is only relevant for OpenShiftSDN-based envs.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants