Skip to content

fix 1.15 base image build#6190

Merged
changluyi merged 1 commit intorelease-1.15from
fix_base_image_build_1.15
Jan 22, 2026
Merged

fix 1.15 base image build#6190
changluyi merged 1 commit intorelease-1.15from
fix_base_image_build_1.15

Conversation

@changluyi
Copy link
Copy Markdown
Collaborator

Pull Request

What type of this PR

Examples of user facing changes:

  • Features
  • Bug fixes
  • Docs
  • Tests

Which issue(s) this PR fixes

Fixes #(issue-number)

@dosubot dosubot bot added size:M This PR changes 30-99 lines, ignoring generated files. bug Something isn't working labels Jan 22, 2026
@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello @changluyi, 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 resolves a build failure for the 1.15 base image by updating a specific patch related to load balancer backend selection. The changes include minor updates to the patch's metadata, a crucial memory deallocation fix, and a refactoring of core load balancing functions to improve the handling of logical switch ports.

Highlights

  • Base Image Build Fix: This pull request addresses and fixes an issue encountered during the build process of the 1.15 base image.
  • Load Balancer Patch Update: An existing patch, 9286e1fd578fdb8f565a0f4aa9066b538295e1ac.patch, which is related to selecting local load balancer backends, has been updated. The comment in the Dockerfile now includes 'tmp', indicating a temporary or iterative change to this patch.
  • Memory Management Improvement: A sset_destroy call was added in northd/northd.c for logical_ports, which improves memory management and prevents potential leaks related to logical port sets.
  • Load Balancer Function Refactoring: Several load balancer related functions, including build_lb_rules and build_lswitch_flows_for_lb, have been refactored to accept an additional ls_ports hash map. This change likely enhances how logical switch ports are managed and processed during the construction of load balancing rules.
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 by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

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 pull request 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 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. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

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.

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

This pull request aims to fix the base image build. The changes involve updating a patch file to fix a memory leak and modifying a comment in the Dockerfile. The memory leak fix in dist/images/patches/9286e1fd578fdb8f565a0f4aa9066b538295e1ac.patch by adding sset_destroy is a critical and correct change. My review includes one suggestion for the comment in dist/images/Dockerfile.base to improve clarity and maintainability.

# skip node local dns ip conntrack when set acl
git apply $SRC_DIR/e7d3ba53cdcbc524bb29c54ddb07b83cc4258ed7.patch && \
# loadbalancer select local backend first
# loadbalancer select local backend first tmp
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

The word tmp has been added to this comment, which suggests this might be a temporary change. For future maintainability, it would be clearer to either remove tmp if the change is permanent, or add a more descriptive comment explaining why this is a temporary measure and what the long-term plan is.

	# loadbalancer select local backend first

@coveralls
Copy link
Copy Markdown

Pull Request Test Coverage Report for Build 21234244601

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.004%) to 22.895%

Totals Coverage Status
Change from base Build 21196451705: 0.004%
Covered Lines: 12281
Relevant Lines: 53640

💛 - Coveralls

@changluyi changluyi requested a review from oilbeater January 22, 2026 03:56
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Jan 22, 2026
@changluyi changluyi merged commit dd26504 into release-1.15 Jan 22, 2026
74 checks passed
@changluyi changluyi deleted the fix_base_image_build_1.15 branch January 22, 2026 06:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working lgtm This PR has been approved by a maintainer size:M This PR changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants