Skip to content

Conversation

@mkhon
Copy link

@mkhon mkhon commented Dec 22, 2025

Fixes kubeedge/kubeedge#5802

Additionally, calls to podCfg.SetInitPodReady(true) in edge/pkg/edged/edged.go need to be removed

@gemini-code-assist
Copy link

Summary of Changes

Hello @mkhon, 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 critical bug that was causing VM reconciliation failures. The issue stemmed from an incorrect implementation of the SeenAllSources logic, which was prematurely signaling readiness before all necessary pod data had been fully processed. By reverting the problematic commit and refactoring the source tracking mechanism, this change ensures that SeenAllSources accurately reflects the state of pod readiness, thereby restoring correct VM reconciliation behavior.

Highlights

  • Revert of Previous Commit: This pull request reverts commit a2eaf54ed8db70d3bd15369d3e57bf3c75c2c269, which introduced a regression in VM reconciliation.
  • Refactored SeenAllSources Logic: The SeenAllSources method in PodConfig has been updated to correctly determine when all sources have been processed. It now verifies that pods have been read and added, rather than relying on an prematurely set initPodReady flag.
  • Removal of podReady Struct and SetInitPodReady: The podReady struct, along with its initPodReady flag and podReadyLock, and the SetInitPodReady function, have been removed as they were identified as the cause of the VM reconciliation issue.
  • Introduction of podStorage.seenSources: A new helper method seenSources has been added to podStorage to provide a robust way to check if all specified sources have been processed.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

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

@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 reverts commit a2eaf54ed8db70d3bd15369d3e57bf3c75c2c269, which introduced a bug in VM reconciliation. The original change modified SeenAllSources() to rely on a flag that was set prematurely. This revert restores the previous, correct logic where readiness is determined by checking that all pod sources have been fully processed. The changes in this PR are correct and effectively fix the regression. I have included one suggestion to slightly improve the restored code's readability and performance.

Comment on lines +104 to +105
klog.V(5).InfoS("Looking for sources, have seen", "sources", sets.List(c.sources), "seenSources", seenSources)
return seenSources.HasAll(sets.List(c.sources)...) && c.pods.seenSources(sets.List(c.sources)...)

Choose a reason for hiding this comment

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

medium

To improve readability and avoid a minor performance hit, it's better to call sets.List(c.sources) only once and store its result in a local variable. The current implementation calls it twice if the V(5) log level is enabled, which involves creating and sorting a slice each time. While the performance impact is likely negligible given the small number of sources, factoring it out makes the code cleaner.

	sourcesList := sets.List(c.sources)
	klog.V(5).InfoS("Looking for sources, have seen", "sources", sourcesList, "seenSources", seenSources)
	return seenSources.HasAll(sourcesList...) && c.pods.seenSources(sourcesList...)

Author: Shelley-BaoYue <[email protected]>
Date:   Wed Jan 31 15:08:39 2024 +0800

    replace pod ready with edgedCh

This breaks VM reconciliation as "SeenAllSources()" should return "true"
only after the pods have been read and added, not after they are written
to update channel

Signed-off-by: Maxim Khon <[email protected]>
@mkhon mkhon force-pushed the fix/v1.32.10-kubeedge/vm-reconciliation branch from 0e4f2cc to 1030536 Compare December 22, 2025 18:38
@mkhon mkhon changed the title Revert commit a2eaf54ed8db70d3bd15369d3e57bf3c75c2c269 Fix VM reconciliation Dec 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant