Skip to content

operator: fix operator count conflict #9290

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

Merged
merged 7 commits into from
May 8, 2025
Merged

Conversation

lhy1024
Copy link
Contributor

@lhy1024 lhy1024 commented May 7, 2025

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 2 commits May 6, 2025 23:59
Signed-off-by: lhy1024 <admin@liudos.us>
Signed-off-by: lhy1024 <admin@liudos.us>
@lhy1024 lhy1024 requested review from JmPotato and rleungx May 7, 2025 03:56
@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-triage-completed release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has signed the dco. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 7, 2025
Signed-off-by: lhy1024 <admin@liudos.us>
Copy link

codecov bot commented May 7, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 76.04%. Comparing base (ab7efa6) to head (ab536a5).
Report is 2 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9290      +/-   ##
==========================================
- Coverage   76.14%   76.04%   -0.11%     
==========================================
  Files         472      472              
  Lines       73259    73267       +8     
==========================================
- Hits        55783    55714      -69     
- Misses      14026    14088      +62     
- Partials     3450     3465      +15     
Flag Coverage Δ
unittests 76.04% <100.00%> (-0.11%) ⬇️

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.

Signed-off-by: lhy1024 <admin@liudos.us>
Signed-off-by: lhy1024 <admin@liudos.us>
Signed-off-by: lhy1024 <admin@liudos.us>
@lhy1024 lhy1024 requested review from JmPotato and rleungx May 7, 2025 07:14
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels May 7, 2025
@ti-chi-bot ti-chi-bot bot added the lgtm label May 8, 2025
Copy link
Contributor

ti-chi-bot bot commented May 8, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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 [JmPotato,bufferflies]

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 removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label May 8, 2025
Copy link
Contributor

ti-chi-bot bot commented May 8, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-05-07 10:07:16.252941252 +0000 UTC m=+436083.435844511: ☑️ agreed by JmPotato.
  • 2025-05-08 03:04:16.206097239 +0000 UTC m=+497103.389000498: ☑️ agreed by bufferflies.

@lhy1024
Copy link
Contributor Author

lhy1024 commented May 8, 2025

/test pull-integration-realcluster-test

@ti-chi-bot ti-chi-bot bot merged commit 8b0c7b6 into tikv:master May 8, 2025
28 of 36 checks passed
@lhy1024 lhy1024 deleted the merge-fix-2 branch May 8, 2025 06:13
@ti-chi-bot ti-chi-bot bot added the needs-cherry-pick-release-8.5 Should cherry pick this PR to release-8.5 branch. label May 8, 2025
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.5: #9303.

ti-chi-bot bot pushed a commit that referenced this pull request May 9, 2025
close #8452

Signed-off-by: lhy1024 <admin@liudos.us>

Co-authored-by: lhy1024 <admin@liudos.us>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved dco-signoff: yes Indicates the PR's author has signed the dco. lgtm needs-cherry-pick-release-8.5 Should cherry pick this PR to release-8.5 branch. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

merge region reach limit while there is no any operator
5 participants