Skip to content

operator: fix operator count conflict (#9290) #9303

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 6 commits into from
May 9, 2025
Merged

operator: fix operator count conflict (#9290) #9303

merged 6 commits into from
May 9, 2025
+63 −5

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #9290

What problem does this PR solve?

Issue Number: Close #8452

What is changed and how does it work?

Check List

Tests

  • Unit test
  • Manual test (add detailed scripts or steps below)
    it will failed in master branch
--- FAIL: TestOperatorControllerTestSuite (0.01s)
    --- FAIL: TestOperatorControllerTestSuite/TestConcurrentMergeConflict (0.01s)
        /home/lhy1024/pd/pkg/schedule/operator/operator_controller_test.go:538: 
            	Error Trace:	/home/lhy1024/pd/pkg/schedule/operator/operator_controller_test.go:538
            	Error:      	Not equal: 
            	            	expected: 2
            	            	actual  : 3
            	Test:       	TestOperatorControllerTestSuite/TestConcurrentMergeConflict
FAIL
exit status 1

Release note

None.

lhy1024 added 6 commits May 8, 2025 13:06
@lhy1024 @ti-chi-bot
operator: fix operator count conflict
8d0995a 
Signed-off-by: lhy1024 <admin@liudos.us>
@lhy1024 @ti-chi-bot
renew test
6ea34ba 
Signed-off-by: lhy1024 <admin@liudos.us>
@lhy1024 @ti-chi-bot
fix lint
479317a 
Signed-off-by: lhy1024 <admin@liudos.us>
@lhy1024 @ti-chi-bot
add coverage
473b711 
Signed-off-by: lhy1024 <admin@liudos.us>
@lhy1024 @ti-chi-bot
add metrics
f826aeb 
Signed-off-by: lhy1024 <admin@liudos.us>
@lhy1024 @ti-chi-bot
address comments
13713aa 
Signed-off-by: lhy1024 <admin@liudos.us>
@ti-chi-bot ti-chi-bot added dco-signoff: yes Indicates the PR's author has signed the dco. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels May 8, 2025
@ti-chi-bot ti-chi-bot mentioned this pull request May 8, 2025
Merged
@codecov Codecov
Copy link

codecov bot commented May 8, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 38.46154% with 8 lines in your changes missing coverage. Please review.

Project coverage is 75.69%. Comparing base (244fda2) to head (13713aa).
Report is 1 commits behind head on release-8.5.

❌ Your patch status has failed because the patch coverage (38.46%) is below the target coverage (74.00%). You can increase the patch coverage or adjust the target coverage.

Additional details and impacted files 
@@               Coverage Diff               @@
##           release-8.5    #9303      +/-   ##
===============================================
+ Coverage        75.61%   75.69%   +0.08%     
===============================================
  Files              462      462              
  Lines            72422    72430       +8     
===============================================
+ Hits             54762    54829      +67     
+ Misses           14163    14118      -45     
+ Partials          3497     3483      -14
Flag Coverage Δ
unittests 75.69% <38.46%> (+0.08%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@ti-chi-bot ti-chi-bot bot added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels May 8, 2025
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels May 9, 2025
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented May 9, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bufferflies, lhy1024

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

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [bufferflies,lhy1024]

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 lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels May 9, 2025
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented May 9, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-05-09 02:08:29.77965718 +0000 UTC m=+65375.927618397: ☑️ agreed by bufferflies.
  • 2025-05-09 08:41:05.798350564 +0000 UTC m=+88931.946311782: ☑️ agreed by lhy1024.

@ti-chi-bot ti-chi-bot bot merged commit 71d81bd into tikv:release-8.5 May 9, 2025
51 of 78 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhy1024 lhy1024 lhy1024 approved these changes

@bufferflies bufferflies bufferflies approved these changes

Assignees

@lhy1024 lhy1024

Labels
approved cherry-pick-approved Cherry pick PR approved by release team. dco-signoff: yes Indicates the PR's author has signed the dco. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ti-chi-bot @lhy1024 @bufferflies