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

schedule: fix a thread-safe bug and improve code (#1719) #1734

Merged
merged 15 commits into from Sep 11, 2019

Conversation

@Luffbee
Copy link
Contributor

commented Sep 6, 2019

What problem does this PR solve?

cherry-pick #1719

@Luffbee Luffbee added the cherry-pick label Sep 6, 2019
Luffbee added 2 commits Sep 6, 2019
@Luffbee Luffbee requested review from nolouch and rleungx and removed request for nolouch Sep 7, 2019
@nolouch

This comment has been minimized.

Copy link
Member

commented Sep 9, 2019

/run-all-tests tidb=release-3.0 tikv=release-3.0 tidb-test=release-3.0

@nolouch
nolouch approved these changes Sep 9, 2019
Copy link
Member

left a comment

lgtm

@nolouch nolouch added the status/LGT1 label Sep 9, 2019
@rleungx
rleungx approved these changes Sep 9, 2019
server/schedule/operator_controller.go Outdated Show resolved Hide resolved
server/schedule/operator_controller.go Outdated Show resolved Hide resolved
Copy link
Member

left a comment

After thinking about it, I think we don't need to update these two metrics. Because the people who upgrade PD to the next version maybe not upgrade tidb-ansible.

@Luffbee

This comment has been minimized.

Copy link
Contributor Author

commented Sep 10, 2019

After thinking about it, I think we don't need to update these two metrics. Because the people who upgrade PD to the next version maybe not upgrade tidb-ansible.

Changed them back.

@sre-bot

This comment has been minimized.

Copy link

commented Sep 11, 2019

Your auto merge job has been accepted, waiting for 1748

@sre-bot

This comment has been minimized.

Copy link

commented Sep 11, 2019

/run-all-tests

@sre-bot sre-bot merged commit e07854f into pingcap:release-3.0 Sep 11, 2019
8 checks passed
8 checks passed
ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
idc-jenkins-ci-pd/integration-common-test Jenkins job succeeded.
Details
idc-jenkins-ci-pd/integration-compatibility-test Jenkins job succeeded.
Details
idc-jenkins-ci-pd/integration-ddl-test Jenkins job succeeded.
Details
idc-jenkins-ci/build Jenkins job succeeded.
Details
idc-jenkins-ci/test Jenkins job succeeded.
Details
license/cla Contributor License Agreement is signed.
Details
@sre-bot

This comment has been minimized.

Copy link

commented Sep 11, 2019

cherry pick to release-3.1 in PR #1751

nolouch added a commit that referenced this pull request Sep 29, 2019
@Luffbee Luffbee deleted the Luffbee:cherry-pick-1719-3.0 branch Oct 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.