Fixing incomplete execution of the configuration issue #521
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
jaysheth2
requested review from
sanfern,
charleskbliu0,
jniesz,
dalalkaran and
pmoroney
as code owners
Signed-off-by: Jay Sheth <[email protected]>
jaysheth2
force-pushed
the
jay-error-fix-1
branch
from
8636445 to
51f8fda
Compare
sanfern
requested changes
Jan 24, 2025
bpfprogs/nfconfig.go
Outdated
Comment on lines
768
to
772
| if combinedError == nil { // saving all the errors for c.Deploy c.SaveConfigsToConfigStore to combinedError instead of returning right away. | ||
| combinedError = fmt.Errorf("deploy eBPF Programs failed to save configs %w", err) | ||
| } else { | ||
| combinedError = fmt.Errorf("%v; %v", combinedError, fmt.Errorf("deploy eBPF Programs failed to save configs %w", err)) | ||
| } |
There was a problem hiding this comment.
Suggested change
| if combinedError == nil { // saving all the errors for c.Deploy c.SaveConfigsToConfigStore to combinedError instead of returning right away. | |
| combinedError = fmt.Errorf("deploy eBPF Programs failed to save configs %w", err) | |
| } else { | |
| combinedError = fmt.Errorf("%v; %v", combinedError, fmt.Errorf("deploy eBPF Programs failed to save configs %w", err)) | |
| } | |
| combinedError = combinedError.Join(combinedError, fmt.Errorf("deploy eBPF Programs failed to save configs %w", err)) | |
There was a problem hiding this comment.
combinedError is of type error, which does not have Join function
There was a problem hiding this comment.
For reference https://go.dev/play/p/l__RgsxAU2e
bpfprogs/nfconfig.go
Outdated
Comment on lines
773
to
777
| } | ||
| if combinedError == nil { | ||
| combinedError = fmt.Errorf("deploy eBPF Programs failed to save configs %w", err) | ||
| } else { | ||
| combinedError = fmt.Errorf("%v; %v", combinedError, fmt.Errorf("failed to deploy BPF program on iface %s with error: %w", bpfProg.Iface, err)) |
There was a problem hiding this comment.
Can we remove this SaveConfigsToConfigStore(); call ? we have to save config at the end with the good state only.
There was a problem hiding this comment.
Removed the SaveConfigsToConfigStore() call
bpfprogs/nfconfig.go
Outdated
| @@ -782,6 +796,8 @@ func (c *NFConfigs) DeployeBPFPrograms(bpfProgs []models.L3afBPFPrograms) error | |||
| return nil | |||
| } | |||
|
|
|||
| // function to combine all errors in []error and return a single error | |||
There was a problem hiding this comment.
Can we remove these comments that are no longer relevant?
Signed-off-by: Jay Sheth <[email protected]>
Signed-off-by: Jay Sheth <[email protected]>
sanfern
requested changes
Jan 27, 2025
bpfprogs/nfconfig.go
Outdated
| @@ -779,7 +781,7 @@ func (c *NFConfigs) DeployeBPFPrograms(bpfProgs []models.L3afBPFPrograms) error | |||
| if err := c.SaveConfigsToConfigStore(); err != nil { | |||
| return fmt.Errorf("deploy eBPF Programs failed to save configs %w", err) | |||
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf("deploy eBPF Programs failed to save configs %w", err) | |
| combinedError = errors.Join(combinedError, fmt.Errorf("deploy eBPF Programs failed to save configs %w", err)) |
Signed-off-by: Jay Sheth <[email protected]>
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.
Addressing #520
In case the payload consist of the configuration which requires eBPF programs for multiple interfaces to be loaded (for example, eth1, eth2, and eth3).
In the scenario where eth2 exists no more:
In this PR, we remove the return statements in the for loop and instead save individual error messages to single variable. This variable is then returned after the for loop is completed.