Skip to content
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

operator: fix bug for using AddOpInfluence (#5312) #5350

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #5312

What problem does this PR solve?

Issue Number: Close #5311

Tests

  • Unit test

Release note

None.

close tikv#5311

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Jul 25, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lhy1024
  • nolouch

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved labels Jul 25, 2022
@ti-chi-bot ti-chi-bot added the type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. label Jul 25, 2022
@bufferflies
Copy link
Contributor

plz @CabinfeverB ,fix the conflict.

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jul 26, 2022
cluster := mockcluster.NewCluster(suite.ctx, config.NewTestOptions())
stream := hbstream.NewTestHeartbeatStreams(suite.ctx, cluster.ID, cluster, false /* no need to run */)
controller := NewOperatorController(suite.ctx, cluster, stream)
>>>>>>> e339c83bb (operator: fix bug for using `AddOpInfluence ` (#5312))
Copy link
Contributor

Choose a reason for hiding this comment

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

some conflicts.

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 27, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 27, 2022
@nolouch
Copy link
Contributor

nolouch commented Jul 27, 2022

/merge

@ti-chi-bot
Copy link
Member Author

@nolouch: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

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 ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: 3fa455d

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 27, 2022
@codecov
Copy link

codecov bot commented Jul 27, 2022

Codecov Report

Merging #5350 (3fa455d) into release-6.1 (d32cfb9) will increase coverage by 0.05%.
The diff coverage is 100.00%.

@@               Coverage Diff               @@
##           release-6.1    #5350      +/-   ##
===============================================
+ Coverage        75.52%   75.58%   +0.05%     
===============================================
  Files              307      307              
  Lines            30357    30356       -1     
===============================================
+ Hits             22928    22944      +16     
+ Misses            5443     5427      -16     
+ Partials          1986     1985       -1     
Flag Coverage Δ
unittests 75.58% <100.00%> (+0.05%) ⬆️

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

Impacted Files Coverage Δ
server/schedule/operator_controller.go 85.74% <100.00%> (+1.17%) ⬆️
pkg/tempurl/tempurl.go 45.00% <0.00%> (-15.00%) ⬇️
server/tso/local_allocator.go 64.86% <0.00%> (-13.52%) ⬇️
server/id/id.go 76.19% <0.00%> (-4.77%) ⬇️
server/schedule/labeler/labeler.go 76.77% <0.00%> (-1.30%) ⬇️
tools/pd-ctl/pdctl/command/operator.go 66.66% <0.00%> (-1.15%) ⬇️
server/cluster/coordinator.go 70.63% <0.00%> (-0.83%) ⬇️
server/cluster/cluster.go 83.04% <0.00%> (-0.65%) ⬇️
server/cluster/unsafe_recovery_controller.go 80.54% <0.00%> (-0.37%) ⬇️
server/schedule/operator/step.go 74.74% <0.00%> (-0.34%) ⬇️
... and 14 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d32cfb9...3fa455d. Read the comment docs.

@ti-chi-bot ti-chi-bot merged commit f938bd5 into tikv:release-6.1 Jul 27, 2022
@jayl1e jayl1e added this to the v6.1.1 milestone Aug 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants