Skip to content

Conversation

@kingeasternsun
Copy link
Contributor

What type of PR is this?

cherrypick #4829 to release 1.13:

What this PR does / why we need it:

Fixes #4828

Which issue(s) this PR fixes:

Fixes #4828

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fix a bug where Jobs in the Aborting phase could transition to Aborted while some Pods were still terminating by keeping terminating Pods in the job cache until they are fully deleted.

Signed-off-by: wangdongyang1 <wangdongyang1@sensetime.com>
@volcano-sh-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign wangyang0616 for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@gemini-code-assist
Copy link

Summary of Changes

Hello @kingeasternsun, 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 cherry-picks a critical fix to the 1.13 release branch, resolving an issue in the job controller where jobs could incorrectly mark themselves as 'Aborted' even when their associated pods were still in the process of terminating. The change ensures that terminating pods are kept within the job's internal cache until their complete deletion, thereby preventing premature job state transitions and enhancing the robustness of job management.

Highlights

  • Bug Fix: Addresses a bug where Jobs in the Aborting phase could prematurely transition to an 'Aborted' state while some associated Pods were still in the process of terminating.
  • Pod Handling Logic: Modifies the job controller's addPod and updatePod functions to ensure that pods with a DeletionTimestamp (i.e., terminating pods) are retained in the job's internal cache until they are fully deleted, preventing their early removal.
  • Test Coverage: Introduces new test cases for addPod and updatePod functions to explicitly verify that terminating pods are correctly handled and remain in the job cache as intended by the fix.

🧠 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.

@volcano-sh-bot volcano-sh-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 23, 2025
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 is a cherry-pick that fixes a bug where jobs could transition to an Aborted state while some of their pods were still terminating. The issue stemmed from prematurely removing pods with a DeletionTimestamp from the job cache in the addPod and updatePod handlers.

The fix correctly removes this logic, ensuring that terminating pods remain in the cache until they are fully deleted, at which point a proper delete event is received. This allows the job state machine to have an accurate view of its pods and manage its lifecycle correctly.

The changes are accompanied by new test cases in TestAddPodFunc and TestUpdatePodFunc that specifically verify the corrected behavior for pods with a DeletionTimestamp.

The changes are logical, well-targeted, and the added tests provide good coverage for the fix. The pull request looks good to merge.

@JesseStutler
Copy link
Member

/lgtm

@volcano-sh-bot volcano-sh-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 23, 2025
@kingeasternsun
Copy link
Contributor Author

/Re-run jobs

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants