-
Notifications
You must be signed in to change notification settings - Fork 702
tiflash: correct the default value of task_scheduler_active_set_soft_limit (#21137) #21146
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
tiflash: correct the default value of task_scheduler_active_set_soft_limit (#21137) #21146
Conversation
Signed-off-by: ti-chi-bot <[email protected]>
@hfxsd This PR has conflicts, I have hold it. |
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Summary of Changes
Hello @ti-chi-bot, 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 primarily updates documentation files. It corrects the documented default value for a TiFlash configuration parameter (task_scheduler_active_set_soft_limit
) and updates several links in the v7.4.0 release notes to point to the documentation archive. Critically, the update to the TiFlash configuration file documentation appears to have introduced merge conflicts that require resolution.
Highlights
- Documentation Link Updates: Links within the v7.4.0 release notes pointing to the main documentation site have been updated to point to the documentation archive site.
- Merge Conflict Detected: It looks like merge conflict markers (
<<<<<<< HEAD
,=======
,>>>>>>> ...
) were introduced in thetiflash/tiflash-configuration.md
file during the cherry-pick process. This needs to be resolved.
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 in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command>
or @gemini-code-assist <command>
. Below is a summary of the supported commands.
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 issue 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 is currently in preview and 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 to provide feedback.
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
-
Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configureGemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩
There was a problem hiding this 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 correct the default value description for the task_scheduler_active_set_soft_limit
TiFlash parameter in the release notes and the TiFlash configuration documentation. The changes also include updating several documentation links in the release notes to point to an archive domain.
The description for the task_scheduler_active_set_soft_limit
parameter itself, as intended by the cherry-pick, appears to be correctly updated in both releases/release-7.4.0.md
and within the conflicted section of tiflash/tiflash-configuration.md
. These descriptions are clear and adhere to formatting guidelines such as using backticks for parameter values and maintaining proper heading hierarchy and spacing for lists [^1], [^2], [^3].
However, the most critical issue is the presence of unresolved merge conflict markers in tiflash/tiflash-configuration.md
. These markers (<<<<<<< HEAD
, =======
, >>>>>>>
) must be removed to ensure the document is correctly rendered and the intended changes are applied. This needs to be addressed before merging.
Once the merge conflict is resolved, the documentation for the task_scheduler_active_set_soft_limit
parameter should accurately reflect its new default value as described.
@@ -39,6 +39,7 @@ This section introduces the configuration parameters of TiFlash. | |||
|
|||
### Configure the `tiflash.toml` file | |||
|
|||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file contains unresolved merge conflict markers (<<<<<<< HEAD
, =======
, >>>>>>>
). These markers must be removed, and the conflict needs to be properly resolved before this PR can be merged.
The conflict appears to span from this line (line 42) down to approximately line 756, where the >>>>>>> 8dfa166d71 (tiflash: correct the default value of task_scheduler_active_set_soft_limit (#21137))
marker is found.
Please ensure that the final content reflects the intended changes from the cherry-picked commit and that all conflict markers are gone.
@ti-chi-bot: The following test failed, say
Full PR test history. Your PR dashboard. 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. |
This is an automated cherry-pick of #21137
First-time contributors' checklist
What is changed, added or deleted? (Required)
Which TiDB version(s) do your changes apply to? (Required)
Tips for choosing the affected version(s):
By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.
For details, see tips for choosing the affected versions.
What is the related PR or file link(s)?
task_scheduler_active_set_soft_limit
docs-cn#20474Do your changes match any of the following descriptions?