Skip to content

dnsproxy: fix error when sessionUDPFactory fails #33998

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

Merged
merged 1 commit into from
Aug 14, 2024

Conversation

marseel
Copy link
Contributor

@marseel marseel commented Jul 24, 2024

Fixes: #28163

Before, we were always printing nil from previous err rather than current ferr.

I've asked you @mhofstetter for review just to double check as I wasn't sure if you wanted to have separate error for some side-effect with ferr / err🤔? I couldn't find anything though.

@marseel marseel added the release-note/misc This PR makes changes that have no direct user impact. label Jul 24, 2024
@marseel marseel requested a review from mhofstetter July 24, 2024 17:30
@marseel marseel requested a review from a team as a code owner July 24, 2024 17:30
@marseel marseel requested a review from doniacld July 24, 2024 17:30
@marseel
Copy link
Contributor Author

marseel commented Jul 24, 2024

/test

@github-actions github-actions bot added the sig/policy Impacts whether traffic is allowed or denied based on user-defined policies. label Jul 24, 2024
Copy link
Member

@mhofstetter mhofstetter left a comment

Choose a reason for hiding this comment

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

I've asked you @mhofstetter for review just to double check as I wasn't sure if you wanted to have separate error for some side-effect with ferr / err🤔? I couldn't find anything though.

No i'm not (no longer 😁 ) aware of such a special case. But thanks for asking!

LGTM - thanks for fixing this ✔️

Copy link
Contributor

@doniacld doniacld left a comment

Choose a reason for hiding this comment

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

lgtm!

Before, we were always printing nil from previous err rather than
current ferr.

Fixes: cilium#28163

Signed-off-by: Marcel Zieba <marcel.zieba@isovalent.com>
@marseel marseel force-pushed the fix_dnsproxy_error branch from 77b19c3 to 666aa52 Compare August 12, 2024 10:23
@marseel
Copy link
Contributor Author

marseel commented Aug 12, 2024

/test

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Aug 14, 2024
@tklauser tklauser added this pull request to the merge queue Aug 14, 2024
Merged via the queue into cilium:main with commit 5e59656 Aug 14, 2024
66 checks passed
@marseel marseel added needs-backport/1.14 needs-backport/1.16 This PR / issue needs backporting to the v1.16 branch labels Oct 25, 2024
@tklauser tklauser mentioned this pull request Oct 25, 2024
7 tasks
@tklauser tklauser added backport-pending/1.16 The backport for Cilium 1.16.x for this PR is in progress. and removed needs-backport/1.16 This PR / issue needs backporting to the v1.16 branch labels Oct 25, 2024
@github-actions github-actions bot added backport-done/1.16 The backport for Cilium 1.16.x for this PR is done. and removed backport-pending/1.16 The backport for Cilium 1.16.x for this PR is in progress. labels Oct 25, 2024
@rastislavs rastislavs mentioned this pull request Oct 28, 2024
6 tasks
@rastislavs rastislavs added backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. and removed needs-backport/1.15 labels Oct 28, 2024
@rastislavs rastislavs mentioned this pull request Oct 28, 2024
3 tasks
@rastislavs rastislavs added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 labels Oct 28, 2024
@github-actions github-actions bot removed the backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. label Oct 28, 2024
@github-actions github-actions bot added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. and removed backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. labels Oct 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. backport-done/1.16 The backport for Cilium 1.16.x for this PR is done. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact. sig/policy Impacts whether traffic is allowed or denied based on user-defined policies.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants