Skip to content

del and add acls in one transaction#5394

Merged
oilbeater merged 1 commit intomasterfrom
fix/subnet-acl
Jun 26, 2025
Merged

del and add acls in one transaction#5394
oilbeater merged 1 commit intomasterfrom
fix/subnet-acl

Conversation

@oilbeater
Copy link
Copy Markdown
Collaborator

Pull Request

What type of this PR

Examples of user facing changes:

  • Bug fixes

Which issue(s) this PR fixes

Fixes #5374

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
@dosubot dosubot Bot added the size:S This PR changes 10-29 lines, ignoring generated files. label Jun 25, 2025
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

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

Summary of Changes

Hello @oilbeater, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a bug related to how Logical Switch ACLs are updated in OVN. The primary change ensures that the process of removing existing ACLs and applying new ones is atomic, meaning both operations succeed or fail together. This prevents transient states where a logical switch might temporarily be without necessary network policies during an update, enhancing the reliability of network security configurations.

Highlights

  • Atomic ACL Updates: The UpdateLogicalSwitchACL function has been refactored to perform the deletion of old ACLs and the creation of new ACLs within a single OVN transaction. This ensures atomicity, preventing a temporary state where no ACLs are present between the delete and add operations, which could lead to policy enforcement gaps.
  • Conditional ACL Deletion: The initial unconditional DeleteAcls call at the beginning of UpdateLogicalSwitchACL (lines 453-456) has been removed. Now, ACLs are only explicitly deleted if the subnetAcls list is empty (lines 454-457), signifying that all ACLs for the logical switch should be removed.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@dosubot dosubot Bot added the bug Something isn't working label Jun 25, 2025
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

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

Code Review

The pull request significantly improves the UpdateLogicalSwitchACL function by making the ACL deletion and creation process atomic. By consolidating these operations into a single OVSDB transaction, the change enhances data consistency and robustness, mitigating potential race conditions that could arise from separate delete and create operations. This is a valuable improvement for the reliability of ACL management. The changes align with common Go best practices for error handling and code clarity.

Comment thread pkg/ovs/ovn-nb-acl.go
Comment on lines +511 to 526
delOps, err := c.DeleteAclsOps(lsName, logicalSwitchKey, "", map[string]string{"subnet": lsName})
if err != nil {
klog.Error(err)
return err
}

addOps, err := c.CreateAclsOps(lsName, logicalSwitchKey, acls...)
if err != nil {
klog.Error(err)
return err
}

if err := c.Transact("acls-update", append(delOps, addOps...)); err != nil {
klog.Error(err)
return fmt.Errorf("add acls to logical switch %s: %w", lsName, err)
return fmt.Errorf("update acls for logical switch %s: %w", lsName, err)
}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

high

This is the core improvement of this pull request. By combining the deletion and creation of ACLs into a single Transact call, you ensure atomicity. This prevents potential inconsistencies or race conditions that could occur if the operations were performed in separate transactions, especially in a concurrent environment. This makes the ACL update operation much more robust and reliable.

Comment thread pkg/ovs/ovn-nb-acl.go
Comment on lines +454 to +457
if err := c.DeleteAcls(lsName, logicalSwitchKey, "", map[string]string{"subnet": lsName}); err != nil {
klog.Error(err)
return fmt.Errorf("delete subnet acls from %s: %w", lsName, err)
}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

This change correctly refactors the ACL deletion logic. Previously, DeleteAcls was called unconditionally, which could lead to unnecessary operations if new ACLs were about to be created anyway. By moving the deletion into the if len(subnetAcls) == 0 block, you ensure that old ACLs are only explicitly deleted when no new ACLs are being added. If new ACLs are present, the deletion will be handled as part of the atomic transaction later in the function.

@coveralls
Copy link
Copy Markdown

Pull Request Test Coverage Report for Build 15870601412

Details

  • 6 of 16 (37.5%) changed or added relevant lines in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.01%) to 21.533%

Changes Missing Coverage Covered Lines Changed/Added Lines %
pkg/ovs/ovn-nb-acl.go 6 16 37.5%
Totals Coverage Status
Change from base Build 15868610181: 0.01%
Covered Lines: 10487
Relevant Lines: 48703

💛 - Coveralls

@oilbeater oilbeater merged commit f7c857c into master Jun 26, 2025
139 of 140 checks passed
@oilbeater oilbeater deleted the fix/subnet-acl branch June 26, 2025 06:20
oilbeater added a commit that referenced this pull request Jun 26, 2025
Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
oilbeater added a commit that referenced this pull request Jun 26, 2025
Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working size:S This PR changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] ACLs recreate when subnet cr update

2 participants