schedule: fix progress cannot display when enabling scheduling service #8334

rleungx · 2024-06-27T05:34:25Z

What problem does this PR solve?

Issue Number: Close #8331.

What is changed and how does it work?

When enabling scheduling service, use an individual function to check if the cluster is prepared.

Check List

Tests

Unit test

Release note

None.

okJiang · 2024-06-27T07:17:09Z

/test pull-integration-realcluster-test

HuSharp · 2024-06-27T08:45:31Z

tests/integrations/mcs/scheduling/server_test.go

@@ -675,3 +675,70 @@ func (suite *multipleServerTestSuite) TestReElectLeader() {
 	rc = suite.pdLeader.GetServer().GetRaftCluster()
 	rc.IsPrepared()
 }
+
+func (suite *serverTestSuite) TestOnlineProgress() {


nit , please move TestOnlineProgress into serverTestSuite scope instead of behind multipleServerTestSuite :)

HuSharp · 2024-06-27T08:48:36Z

--- FAIL: TestServerTestSuite (49.63s)
    --- FAIL: TestServerTestSuite/TestStoreLimit (0.24s)
        server_test.go:596: 
            	Error Trace:	/home/runner/work/pd/pd/tests/integrations/mcs/scheduling/server_test.go:596
            	            				/home/runner/work/pd/pd/tests/integrations/mcs/scheduling/server_test.go:550
            	Error:      	Should be true
            	Test:       	TestServerTestSuite/TestStoreLimit

ci failed, because API cluster didn't clear the environment (the suite is internally serialized), and the InitRegions called by TestOnlineProgress generated region 2 which is different from TestStoreLimit needed, causing it to fail.

lhy1024 · 2024-06-27T12:47:38Z

pkg/schedule/prepare_checker.go

-	// The number of active regions should be more than total region of all stores * collectFactor
-	if float64(totalRegionsCnt)*collectFactor > float64(notLoadedFromRegionsCnt) {
+	// The number of active regions should be more than total region of all stores * CollectFactor
+	if float64(totalRegionsCnt)*CollectFactor > float64(notLoadedFromRegionsCnt) {
 		return false
 	}
 	for _, store := range c.GetStores() {


Could we use the similiar function with isStorePrepared to avoid to maintain the two functions?

Signed-off-by: Ryan Leung <rleungx@gmail.com>

ti-chi-bot · 2024-06-28T06:38:12Z

@okJiang: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

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/test-infra repository.

server/cluster/cluster.go

ti-chi-bot · 2024-06-28T08:00:56Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: HuSharp, lhy1024, okJiang

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~~ [HuSharp,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 · 2024-06-28T08:00:57Z

[LGTM Timeline notifier]

Timeline:

2024-06-28 04:05:36.935916833 +0000 UTC m=+951663.421405650: ☑️ agreed by lhy1024.
2024-06-28 08:00:57.033460587 +0000 UTC m=+965783.518949420: ☑️ agreed by HuSharp.

rleungx · 2024-06-28T08:04:32Z

/merge

ti-chi-bot · 2024-06-28T08:04:34Z

@rleungx: We have migrated to builtin LGTM and approve plugins for reviewing.

👉 Please use /approve when you want approve this pull request.

The changes announcement: Proposal: Strengthen configuration change approval.

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 · 2024-06-28T08:04:48Z

@rleungx: Your PR was out of date, I have automatically updated it for you.

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 · 2024-07-31T08:19:39Z

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

#8334) (#8471) close #8331 Signed-off-by: Ryan Leung <rleungx@gmail.com> Co-authored-by: Ryan Leung <rleungx@gmail.com> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-triage-completed dco-signoff: yes Indicates the PR's author has signed the dco. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 27, 2024

rleungx requested review from JmPotato, lhy1024 and HuSharp June 27, 2024 06:09

ti-chi-bot bot removed the do-not-merge/needs-triage-completed label Jun 27, 2024

HuSharp reviewed Jun 27, 2024

View reviewed changes

rleungx force-pushed the fix-progress branch from 15e4568 to 6d7d90a Compare June 27, 2024 09:49

lhy1024 reviewed Jun 27, 2024

View reviewed changes

rleungx added 4 commits June 28, 2024 10:09

fix progress cannot display when enabling scheduling service

5e10c49

Signed-off-by: Ryan Leung <rleungx@gmail.com>

revert ticker change

d8da1b9

Signed-off-by: Ryan Leung <rleungx@gmail.com>

fix

905945f

Signed-off-by: Ryan Leung <rleungx@gmail.com>

fix

a53ebc0

Signed-off-by: Ryan Leung <rleungx@gmail.com>

rleungx force-pushed the fix-progress branch from 6d7d90a to a53ebc0 Compare June 28, 2024 02:15

rleungx requested review from lhy1024 and HuSharp June 28, 2024 04:04

lhy1024 approved these changes Jun 28, 2024

View reviewed changes

ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Jun 28, 2024

okJiang approved these changes Jun 28, 2024

View reviewed changes

HuSharp reviewed Jun 28, 2024

View reviewed changes

server/cluster/cluster.go Show resolved Hide resolved

HuSharp approved these changes Jun 28, 2024

View reviewed changes

ti-chi-bot bot added the lgtm label Jun 28, 2024

ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Jun 28, 2024

Merge branch 'master' into fix-progress

7f19320

ti-chi-bot bot merged commit d29fd1a into tikv:master Jun 28, 2024
17 checks passed

rleungx deleted the fix-progress branch June 28, 2024 08:27

ti-chi-bot added the needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. label Jul 31, 2024

ti-chi-bot mentioned this pull request Jul 31, 2024

schedule: fix progress cannot display when enabling scheduling service (#8334) #8471

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

schedule: fix progress cannot display when enabling scheduling service #8334

schedule: fix progress cannot display when enabling scheduling service #8334

rleungx commented Jun 27, 2024

okJiang commented Jun 27, 2024

HuSharp Jun 27, 2024

HuSharp commented Jun 27, 2024

lhy1024 Jun 27, 2024

ti-chi-bot bot commented Jun 28, 2024

ti-chi-bot bot commented Jun 28, 2024

ti-chi-bot bot commented Jun 28, 2024

rleungx commented Jun 28, 2024

ti-chi-bot bot commented Jun 28, 2024

ti-chi-bot bot commented Jun 28, 2024

ti-chi-bot commented Jul 31, 2024

schedule: fix progress cannot display when enabling scheduling service #8334

schedule: fix progress cannot display when enabling scheduling service #8334

Conversation

rleungx commented Jun 27, 2024

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

okJiang commented Jun 27, 2024

HuSharp Jun 27, 2024

Choose a reason for hiding this comment

HuSharp commented Jun 27, 2024

lhy1024 Jun 27, 2024

Choose a reason for hiding this comment

ti-chi-bot bot commented Jun 28, 2024

ti-chi-bot bot commented Jun 28, 2024

ti-chi-bot bot commented Jun 28, 2024

[LGTM Timeline notifier]

rleungx commented Jun 28, 2024

ti-chi-bot bot commented Jun 28, 2024

ti-chi-bot bot commented Jun 28, 2024

ti-chi-bot commented Jul 31, 2024