-
Notifications
You must be signed in to change notification settings - Fork 825
fix(server): apply SetPolicies policy assignments #3538
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
Open
Ivan-Pokhabov
wants to merge
1
commit into
osrg:master
Choose a base branch
from
Ivan-Pokhabov:fix/server
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+223
−9
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4646,27 +4646,23 @@ func (r *RoutingPolicy) Initialize() error { | |
| return nil | ||
| } | ||
|
|
||
| func (r *RoutingPolicy) setPeerPolicy(id string, c oc.ApplyPolicy) { | ||
| func (r *RoutingPolicy) setPeerPolicy(id string, c oc.ApplyPolicy) error { | ||
| for _, dir := range []PolicyDirection{POLICY_DIRECTION_IMPORT, POLICY_DIRECTION_EXPORT} { | ||
| ps, def, err := r.getAssignmentFromConfig(dir, c) | ||
| if err != nil { | ||
| r.logger.Error("failed to get policy info", | ||
| slog.String("Topic", "Policy"), | ||
| slog.String("Dir", dir.String()), | ||
| slog.String("Error", err.Error())) | ||
| continue | ||
| return fmt.Errorf("failed to get %s policy info for %s: %w", dir, id, err) | ||
| } | ||
| r.setDefaultPolicy(id, dir, def) | ||
| r.setPolicy(id, dir, ps) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (r *RoutingPolicy) SetPeerPolicy(peerId string, c oc.ApplyPolicy) error { | ||
| r.mu.Lock() | ||
| defer r.mu.Unlock() | ||
|
|
||
| r.setPeerPolicy(peerId, c) | ||
| return nil | ||
| return r.setPeerPolicy(peerId, c) | ||
| } | ||
|
|
||
| func (r *RoutingPolicy) Reset(rp *oc.RoutingPolicy, ap map[string]oc.ApplyPolicy) error { | ||
|
|
@@ -4685,7 +4681,9 @@ func (r *RoutingPolicy) Reset(rp *oc.RoutingPolicy, ap map[string]oc.ApplyPolicy | |
| } | ||
|
|
||
| for id, c := range ap { | ||
| r.setPeerPolicy(id, c) | ||
| if err := r.setPeerPolicy(id, c); err != nil { | ||
| return err | ||
| } | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. reload() has already cleared assignmentMap at this point, so this loop is what restores it. Returning here leaves every id the loop has not reached yet with no assignment, including the global RIB. ap is a map, so which ids survive changes on every call. |
||
| } | ||
| return nil | ||
| } | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this returns an error, I think that it's better to update IMPORT and EXPORT atomically.
Firstly, calling r.getAssignmentFromConfig for both directions, only if both succeeds, then execute setDefaultPolicy and setPolicy for both.