Skip to content

fix(caretaker): clear lock on NEEDS_HUMAN transition - #28601

Merged
chadd28 merged 2 commits into
google-gemini:mainfrom
chadd28:fix/caretaker-clear-lock-needs-human
Aug 7, 2026
Merged

fix(caretaker): clear lock on NEEDS_HUMAN transition#28601
chadd28 merged 2 commits into
google-gemini:mainfrom
chadd28:fix/caretaker-clear-lock-needs-human

Conversation

@chadd28

@chadd28 chadd28 commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

Summary

Clears lock.holder and lock.expires_at when an issue transitions to NEEDS_HUMAN after reaching max claim attempts in IssuesStore.

Details

When _acquire_lock_tx reached attempts >= 2, it transitioned the issue status to NEEDS_HUMAN but failed to clear the active lock fields (lock.holder and lock.expires_at). Setting these to None aligns NEEDS_HUMAN behavior with all other status transitions in IssuesStore.

How to Validate

Run the triage-worker unit test suite:

python -m unittest discover -s tools/caretaker-agent/cloudrun/triage-worker/tests

Pre-Merge Checklist

  • Updated relevant documentation and README (if needed)
  • Added/updated tests (if needed)
  • Noted breaking changes (if any)
  • Validated on required platforms/methods:
    • MacOS
      • npm run
      • npx
      • Docker
      • Podman
      • Seatbelt
    • Windows
      • npm run
      • npx
      • Docker
    • Linux
      • npm run
      • npx
      • Docker

@chadd28
chadd28 requested a review from a team as a code owner July 30, 2026 17:16
@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, 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 ensures consistency in the IssuesStore by cleaning up stale lock information when an issue reaches the maximum number of claim attempts and transitions to NEEDS_HUMAN. This prevents potential issues with lingering lock data after an issue has been escalated for human intervention.

Highlights

  • Lock State Cleanup: Updated the _acquire_lock_tx method to explicitly clear lock.holder and lock.expires_at when an issue transitions to the NEEDS_HUMAN status.
  • Test Verification: Updated the test_acquire_lock_two_strikes_constraint unit test to verify that the lock fields are correctly set to None during the transition.
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 the 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 counterproductive. 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.

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.

@github-actions github-actions Bot added the size/xs An extra small PR label Jul 30, 2026
@github-actions

Copy link
Copy Markdown

📊 PR Size: size/XS

  • Lines changed: 4
  • Additions: +4
  • Deletions: -0
  • Files changed: 2

@github-actions

Copy link
Copy Markdown

You already have 7 pull requests open. Please work on getting existing PRs merged before opening more.

@github-actions github-actions Bot closed this Jul 30, 2026

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

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.

Code Review

This pull request updates the _acquire_lock_tx function in issues_store.py to clear the lock holder and expiration timestamp (setting them to None) when an issue's status is transitioned to NEEDS_HUMAN after multiple failed attempts. It also updates the corresponding unit tests in test_issues_store.py to assert this new behavior. There are no review comments, and I have no feedback to provide.

@chadd28
chadd28 added this pull request to the merge queue Aug 7, 2026
Merged via the queue into google-gemini:main with commit cf22ac7 Aug 7, 2026
34 checks passed
@chadd28
chadd28 deleted the fix/caretaker-clear-lock-needs-human branch August 7, 2026 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/xs An extra small PR status/need-issue Pull requests that need to have an associated issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants