Fix bug in get_dhcp_pid (CoreOS) #2784
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
narrieta
requested review from
ZhidongPeng,
nagworld9 and
maddieford
as code owners
Codecov Report
@@ Coverage Diff @@
## develop #2784 +/- ##
===========================================
+ Coverage 71.97% 71.99% +0.01%
===========================================
Files 103 104 +1
Lines 15692 15844 +152
Branches 2486 2268 -218
===========================================
+ Hits 11295 11407 +112
- Misses 3881 3914 +33
- Partials 516 523 +7
... and 4 files with indirect coverage changes Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
nagworld9
approved these changes
Mar 10, 2023
maddieford
approved these changes
Mar 10, 2023
jepio
added a commit
to flatcar/scripts
that referenced
this pull request
Nov 15, 2023
This is the current version being deployed to the Azure fleet for other distros. This update contains a fix for: Failed to get the PID of the DHCP client: invalid literal for int() with base 10: 'MainPID=1640' The upstream fix (stripping MainPid=) is in Azure/WALinuxAgent#2784. The patch has also been updated to fix the error: Unable to setup the persistent firewall rules: [Errno 30] Read-only file system: '/lib/systemd/system/waagent-network-setup.service' by redirecting unit file installation to /etc/systemd/system. Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
2 tasks
jepio
added a commit
to flatcar/scripts
that referenced
this pull request
Nov 15, 2023
This is the current version being deployed to the Azure fleet for other distros. This update contains a fix for: Failed to get the PID of the DHCP client: invalid literal for int() with base 10: 'MainPID=1640' The upstream fix (stripping MainPid=) is in Azure/WALinuxAgent#2784. The patch has also been updated to fix the error: Unable to setup the persistent firewall rules: [Errno 30] Read-only file system: '/lib/systemd/system/waagent-network-setup.service' by redirecting unit file installation to /etc/systemd/system. Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
jepio
added a commit
to flatcar/scripts
that referenced
this pull request
Nov 16, 2023
This is the current version being deployed to the Azure fleet for other distros. This update contains a fix for: Failed to get the PID of the DHCP client: invalid literal for int() with base 10: 'MainPID=1640' The upstream fix (stripping MainPid=) is in Azure/WALinuxAgent#2784. The patch has also been updated to fix the error: Unable to setup the persistent firewall rules: [Errno 30] Read-only file system: '/lib/systemd/system/waagent-network-setup.service' by redirecting unit file installation to /etc/systemd/system. This change requires handling in manglefs.sh as package installation unfortunately uses the same path. Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
jepio
added a commit
to flatcar/scripts
that referenced
this pull request
Nov 16, 2023
This is the current version being deployed to the Azure fleet for other distros. This update contains a fix for: Failed to get the PID of the DHCP client: invalid literal for int() with base 10: 'MainPID=1640' The upstream fix (stripping MainPid=) is in Azure/WALinuxAgent#2784. The patch has also been updated to fix the error: Unable to setup the persistent firewall rules: [Errno 30] Read-only file system: '/lib/systemd/system/waagent-network-setup.service' by redirecting unit file installation to /etc/systemd/system. This change requires handling in manglefs.sh as package installation unfortunately uses the same path. This also requires adding a dependency on systemd-sysext.service to that unit, as it depends on python. A final change is handling interface restart. RedHat and Ubuntu bounce a single link while Flatcar has so far used the "coreos" implementation (restart the whole systemd-networkd), which forced a full dhcp lease renewal. Follow the approaches of other distros by copying their implementation of restart_if. Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
jepio
added a commit
to flatcar/scripts
that referenced
this pull request
Nov 17, 2023
This is the current version being deployed to the Azure fleet for other distros. This update contains a fix for: Failed to get the PID of the DHCP client: invalid literal for int() with base 10: 'MainPID=1640' The upstream fix (stripping MainPid=) is in Azure/WALinuxAgent#2784. The patch has also been updated to fix the error: Unable to setup the persistent firewall rules: [Errno 30] Read-only file system: '/lib/systemd/system/waagent-network-setup.service' by redirecting unit file installation to /etc/systemd/system. This change requires handling in manglefs.sh as package installation unfortunately uses the same path. This also requires adding a dependency on systemd-sysext.service to that unit, as it depends on python. A final change is handling interface restart. RedHat and Ubuntu bounce a single link while Flatcar has so far used the "coreos" implementation (restart the whole systemd-networkd), which forced a full dhcp lease renewal. Follow the approaches of other distros by copying their implementation of restart_if. Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
jepio
added a commit
to flatcar/scripts
that referenced
this pull request
Nov 17, 2023
This is the current version being deployed to the Azure fleet for other distros. This update contains a fix for: Failed to get the PID of the DHCP client: invalid literal for int() with base 10: 'MainPID=1640' The upstream fix (stripping MainPid=) is in Azure/WALinuxAgent#2784. The patch has also been updated to fix the error: Unable to setup the persistent firewall rules: [Errno 30] Read-only file system: '/lib/systemd/system/waagent-network-setup.service' by redirecting unit file installation to /etc/systemd/system. This change requires handling in manglefs.sh as package installation unfortunately uses the same path. This also requires adding a dependency on systemd-sysext.service to that unit, as it depends on python, which is done through a drop-in. A final change is handling interface restart. RedHat and Ubuntu bounce a single link while Flatcar has so far used the "coreos" implementation (restart the whole systemd-networkd), which forced a full dhcp lease renewal. Follow the approaches of other distros by copying their implementation of restart_if. Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CoreOs and derivatives (e.g. Flatcar) use "systemctl show -p MainPID systemd-networkd" to get the PID of the DHCP client. This command will return something similar to "
MainPID=<PID>", while the existing code expects only an int (the "<PID>" part). This is a very old bug exposed by adding Flatcar to the tests.The fix removes "MainPID=" from the command's output.
The PR also includes some fixes for pylint pointing out issues in import statements.