Skip to content

Conversation

@lidezhu
Copy link
Collaborator

@lidezhu lidezhu commented Dec 24, 2025

What problem does this PR solve?

Issue Number: close #xxx

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Questions

Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?

Release note

Please refer to [Release Notes Language Style Guide](https://pingcap.github.io/tidb-dev-guide/contribute-to-tidb/release-notes-style-guide.html) to write a quality release note.

If you don't think this PR needs a release note then fill it with `None`.

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Dec 24, 2025
@ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 24, 2025

[FORMAT CHECKER NOTIFICATION]

Notice: To remove the do-not-merge/needs-linked-issue label, please provide the linked issue number on one line in the PR body, for example: Issue Number: close #123 or Issue Number: ref #456.

📖 For more info, you can check the "Contribute Code" section in the development guide.

@ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 24, 2025

[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 charlescheung96 for approval. For more information see the Code Review Process.
Please ensure that each of them provides their approval before proceeding.

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

@ti-chi-bot ti-chi-bot bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Dec 24, 2025
@gemini-code-assist
Copy link

Summary of Changes

Hello @lidezhu, 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 implements a significant optimization in how resolved timestamp events are processed within the log puller. By introducing a mechanism to batch multiple resolved timestamp updates for a given subscription, the system can reduce the overhead associated with individual event processing and frequent updates to the range lock heap. This change aims to improve the overall performance and efficiency of resolved timestamp propagation, particularly in scenarios with high event throughput.

Highlights

  • Batch Resolved Timestamp Events: Introduced a new batchResolvedTsEvent structure to group multiple resolved timestamp updates for the same subscription, optimizing event handling.
  • Refactored Event Handling: The regionEventHandler has been refactored to efficiently process these new batch events, including updates to event sizing, path resolution, and event type determination.
  • Optimized Range Lock Updates: Added a UpdateLockedRangeStateHeapBatch method to the regionlock component, allowing for multiple locked range states to be updated in the heap in a single, more efficient operation.
  • Batch Dispatching in Worker: The regionRequestWorker now dispatches resolved timestamp events in batches, aggregating individual updates into a single batchResolvedTsEvent before sending them downstream.

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

@ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 24, 2025

@lidezhu: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-error-log-review f0dcf8a link true /test pull-error-log-review

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

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 introduces batching for resolved timestamp events to improve performance. A new batchResolvedTsEvent is created to group multiple resolved timestamp updates, and the regionEventHandler is updated to process these batches. The regionRequestWorker is also modified to create these batches. The overall changes appear sound and the refactoring in region_event_handler enhances the code's structure. However, I've identified a critical race condition in the new UpdateLockedRangeStateHeapBatch function due to incorrect lock usage, and I've also suggested a refactoring to reduce code duplication in the OnDrop function.

Comment on lines +428 to +429
l.mu.RLock()
defer l.mu.RUnlock()

Choose a reason for hiding this comment

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

critical

There's a potential race condition here. l.lockedRangeStateHeap.AddOrUpdate modifies the heap, which is not a thread-safe operation. It should be protected by a write lock (l.mu.Lock()) instead of a read lock (l.mu.RLock()). Other methods like tryLockRange and UnlockRange that modify the heap are correctly using a write lock. The same issue exists in the UpdateLockedRangeStateHeap function.

Suggested change
l.mu.RLock()
defer l.mu.RUnlock()
l.mu.Lock()
defer l.mu.Unlock()

Comment on lines +196 to 221
if event.batchResolvedTs != nil {
workerID := uint64(0)
if event.worker != nil {
workerID = event.worker.workerID
}
log.Warn("drop batch resolved ts event",
zap.Uint64("subscriptionID", uint64(event.batchResolvedTs.subscriptionID)),
zap.Int("resolvedEntries", len(event.batchResolvedTs.entries)),
zap.Uint64("workerID", workerID))
return nil
}
if event.state == nil {
log.Warn("drop region event without state", zap.Any("event", event))
return nil
}
workerID := uint64(0)
if event.worker != nil {
workerID = event.worker.workerID
}
log.Warn("drop region event",
zap.Uint64("regionID", event.state.getRegionID()),
zap.Uint64("requestID", event.state.requestID),
zap.Uint64("workerID", event.worker.workerID),
zap.Uint64("workerID", workerID),
zap.Bool("hasEntries", event.entries != nil),
zap.Bool("stateIsStale", event.state.isStale()))
return nil

Choose a reason for hiding this comment

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

medium

The logic to get workerID is duplicated. It can be extracted to the top of the function to improve readability and avoid code duplication. Also, the workerID is not logged in the event.state == nil case, which might be useful for debugging.

	workerID := uint64(0)
	if event.worker != nil {
		workerID = event.worker.workerID
	}

	if event.batchResolvedTs != nil {
		log.Warn("drop batch resolved ts event",
			zap.Uint64("subscriptionID", uint64(event.batchResolvedTs.subscriptionID)),
			zap.Int("resolvedEntries", len(event.batchResolvedTs.entries)),
			zap.Uint64("workerID", workerID))
		return nil
	}
	if event.state == nil {
		log.Warn("drop region event without state", zap.Any("event", event), zap.Uint64("workerID", workerID))
		return nil
	}
	log.Warn("drop region event",
		zap.Uint64("regionID", event.state.getRegionID()),
		zap.Uint64("requestID", event.state.requestID),
		zap.Uint64("workerID", workerID),
		zap.Bool("hasEntries", event.entries != nil),
		zap.Bool("stateIsStale", event.state.isStale()))
	return nil

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

Labels

do-not-merge/needs-linked-issue release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants