[10.4 stable] Backport recent zedrouter bug fixes #3472
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
…ange If number allocated for app interface (aka application underlay network) produces IP address outside of DHCP range (meaning that there is no free IP address left at the moment), then the number should be freed before trying to create the app again after another app was deleted. This way zedrouter will reuse interface number from the deleted app and therefore it will also reuse freed IP address (and the retry attempt to create the new app will succeed). Otherwise, zedrouter would just try to use the same IP address outside the DHCP range and fail repeatedly, even if there is a free IP available after deletion of another app. Signed-off-by: Milan Lenco <[email protected]> (cherry picked from commit 7bf73ae)
Currently, we have to remember to set PendingAdd/PendingModify inside AppNetworkStatus to false just before the corresponding handler returns. However, there are few error branches where we forgot to clear the pending flag. This causes zedmanager to just wait and not report the error published inside the AppNetworkStatus. Instead of fixing this case-by-case, let's take advantage of 'defer' to make sure that we will never forget to clear the Pending flag, even if a new branch with return statement is added in the future. Signed-off-by: Milan Lenco <[email protected]> (cherry picked from commit fbacc17)
milan-zededa
changed the title
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.
Backport of zedrouter bug fixes from PRs: #3468 and #3465