*: reset config if the input is invalid #8632

rleungx · 2024-09-14T06:51:20Z

What problem does this PR solve?

Issue Number: Close #8619.

What is changed and how does it work?

Check List

Tests

Unit test

Release note

None.

Signed-off-by: Ryan Leung <[email protected]>

pkg/schedule/schedulers/evict_leader.go

lhy1024

the rest LGTM

lhy1024 · 2024-09-14T07:22:18Z

tools/pd-ctl/tests/scheduler/scheduler_test.go

@@ -813,6 +813,60 @@ func (suite *schedulerTestSuite) checkSchedulerDiagnostic(cluster *pdTests.TestC
 	checkSchedulerDescribeCommand("balance-leader-scheduler", "normal", "")
 }

+func (suite *schedulerTestSuite) TestEvictLeaderScheduler() {
+	// FIXME: API mode may have the problem


Will we fix it in another PR?

codecov · 2024-09-14T07:32:12Z

Codecov Report

Attention: Patch coverage is 0% with 9 lines in your changes missing coverage. Please review.

Project coverage is 77.65%. Comparing base (bd0d4ff) to head (114aa19).
Report is 2 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #8632      +/-   ##
==========================================
+ Coverage   77.63%   77.65%   +0.02%     
==========================================
  Files         474      474              
  Lines       62097    62105       +8     
==========================================
+ Hits        48209    48228      +19     
+ Misses      10340    10337       -3     
+ Partials     3548     3540       -8

Flag	Coverage Δ
unittests	`77.65% <0.00%> (+0.02%)`	⬆️

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

lhy1024 · 2024-09-14T07:47:42Z

tools/pd-ctl/tests/scheduler/scheduler_test.go

+	re.Contains(string(output), "Success!")
+	output, err = tests.ExecuteCommand(cmd, []string{"-u", pdAddr, "scheduler", "remove", "evict-leader-scheduler"}...)
+	re.NoError(err)
+	re.Contains(string(output), "Success!")


Maybe we need to check

testutil.Eventually(re, func() bool { // wait for removed scheduler to be synced to scheduling server. output := mustExec(re, cmd, []string{"-u", pdAddr, "scheduler", "config", "evict-leader-scheduler"}, nil) return strings.Contains(output, "[404] scheduler not found") })

seem not work

niubell · 2024-09-23T07:00:13Z

pkg/schedule/schedulers/evict_leader.go

@@ -408,6 +415,7 @@ func (handler *evictLeaderHandler) updateConfig(w http.ResponseWriter, r *http.R
 	batchFloat, ok := input["batch"].(float64)
 	if ok {
 		if batchFloat < 1 || batchFloat > 10 {
+			handler.config.removeStore(id)


For invalid config parameters, It's better to validate it, do nothing, and return 4xx + error message to let the users know it, it's not classic and unsafe to reset memory content when meeting invalid inputs.

It's a rollback operation since the memory state has been changed in line 407.

Got it, make sense

okJiang · 2024-09-24T03:03:42Z

pkg/schedule/schedulers/evict_leader.go

@@ -408,6 +415,7 @@ func (handler *evictLeaderHandler) updateConfig(w http.ResponseWriter, r *http.R
 	batchFloat, ok := input["batch"].(float64)
 	if ok {
 		if batchFloat < 1 || batchFloat > 10 {
+			handler.config.removeStore(id)


Do we allow the input to not contain the store id? If this, we can check if !inputHasStoreID in L405, and assume that all subsequent cases are inputHasStoreID by default.

How about puting L407(pauseLeaderTransferIfStoreNotExist) behind all checks over? In this case, we don't need to removeStore for each case.

Yes, we allow only changing batch size.

range relies on exist, only batch can be moved, but no much difference I think.

How about adding a defer after L411? For now, it is so easy to forget to removeStore, like L445.

defer func () { if err != nil { .... } }()

ti-chi-bot · 2024-09-24T05:20:56Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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~~ [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-09-24T05:20:58Z

[LGTM Timeline notifier]

Timeline:

2024-09-14 07:22:31.377565329 +0000 UTC m=+686621.117989267: ☑️ agreed by lhy1024.
2024-09-24 05:20:57.557249814 +0000 UTC m=+1543327.297673751: ☑️ agreed by okJiang.

rleungx · 2024-09-24T05:36:14Z

/retest

ti-chi-bot · 2024-09-24T06:17:24Z

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

ti-chi-bot · 2024-09-24T06:17:24Z

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

close tikv#8619 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2024-09-24T06:17:25Z

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

close tikv#8619 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2024-09-24T06:17:26Z

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

close tikv#8619 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2024-09-24T06:17:27Z

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

ti-chi-bot · 2024-09-24T06:17:27Z

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

close tikv#8619 Signed-off-by: ti-chi-bot <[email protected]>

close #8619 Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: Ryan Leung <[email protected]>

close #8619 Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: Ryan Leung <[email protected]> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

close tikv#8619 Signed-off-by: ti-chi-bot <[email protected]>

close #8619 Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: Ryan Leung <[email protected]>

close tikv#8619 Signed-off-by: ti-chi-bot <[email protected]>

rleungx added 2 commits September 14, 2024 14:06

fix build args error

4511fe9

Signed-off-by: Ryan Leung <[email protected]>

add a test

922e1d0

Signed-off-by: Ryan Leung <[email protected]>

ti-chi-bot bot added 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 Sep 14, 2024

rleungx added 5 commits September 14, 2024 14:52

leave a FIXME

f273a7b

Signed-off-by: Ryan Leung <[email protected]>

fix

e2ccf3f

Signed-off-by: Ryan Leung <[email protected]>

fix

fce9f6e

Signed-off-by: Ryan Leung <[email protected]>

fix

4a9aab0

Signed-off-by: Ryan Leung <[email protected]>

fix

f8ff32c

Signed-off-by: Ryan Leung <[email protected]>

lhy1024 reviewed Sep 14, 2024

View reviewed changes

pkg/schedule/schedulers/evict_leader.go Outdated Show resolved Hide resolved

lhy1024 approved these changes Sep 14, 2024

View reviewed changes

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

lhy1024 reviewed Sep 14, 2024

View reviewed changes

niubell reviewed Sep 23, 2024

View reviewed changes

okJiang reviewed Sep 24, 2024

View reviewed changes

okJiang approved these changes Sep 24, 2024

View reviewed changes

ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Sep 24, 2024

Merge branch 'master' into fix-build-error

114aa19

ti-chi-bot bot merged commit 6b927e1 into tikv:master Sep 24, 2024
23 of 25 checks passed

rleungx deleted the fix-build-error branch September 24, 2024 06:07

ti-chi-bot bot added needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. labels Sep 24, 2024

ti-chi-bot bot added needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. labels Sep 24, 2024

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Sep 24, 2024

This is an automated cherry-pick of tikv#8632

466d094

close tikv#8619 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request Sep 24, 2024

*: reset config if the input is invalid (#8632) #8657

Merged

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Sep 24, 2024

This is an automated cherry-pick of tikv#8632

ea584cb

close tikv#8619 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Sep 24, 2024

This is an automated cherry-pick of tikv#8632

42c1b9e

close tikv#8619 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Sep 24, 2024

This is an automated cherry-pick of tikv#8632

84049b0

close tikv#8619 Signed-off-by: ti-chi-bot <[email protected]>

This was referenced Sep 24, 2024

*: reset config if the input is invalid (#8632) #8658

Merged

*: reset config if the input is invalid (#8632) #8659

Merged

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Sep 24, 2024

This is an automated cherry-pick of tikv#8632

35fb84f

close tikv#8619 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request Sep 24, 2024

*: reset config if the input is invalid (#8632) #8660

Merged

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Sep 24, 2024

This is an automated cherry-pick of tikv#8632

23efb98

close tikv#8619 Signed-off-by: ti-chi-bot <[email protected]>

This was referenced Sep 24, 2024

*: reset config if the input is invalid (#8632) #8661

Open

*: reset config if the input is invalid (#8632) #8662

Open

ti-chi-bot bot pushed a commit that referenced this pull request Sep 24, 2024

*: reset config if the input is invalid (#8632) (#8659)

f2231c2

close #8619 Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: Ryan Leung <[email protected]>

ti-chi-bot bot pushed a commit that referenced this pull request Oct 25, 2024

*: reset config if the input is invalid (#8632) (#8658)

2da9d84

close #8619 Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: Ryan Leung <[email protected]>

rleungx added a commit to ti-chi-bot/pd that referenced this pull request Nov 7, 2024

This is an automated cherry-pick of tikv#8632

8227eb9

close tikv#8619 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot bot pushed a commit that referenced this pull request Nov 7, 2024

*: reset config if the input is invalid (#8632) (#8660)

57d5bdc

close #8619 Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: Ryan Leung <[email protected]>

rleungx added a commit to ti-chi-bot/pd that referenced this pull request Nov 11, 2024

This is an automated cherry-pick of tikv#8632

87b5a48

close tikv#8619 Signed-off-by: ti-chi-bot <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

*: reset config if the input is invalid #8632

*: reset config if the input is invalid #8632

rleungx commented Sep 14, 2024

lhy1024 left a comment

lhy1024 Sep 14, 2024

codecov bot commented Sep 14, 2024 •

edited

Loading

lhy1024 Sep 14, 2024 •

edited

Loading

rleungx Sep 23, 2024

niubell Sep 23, 2024

rleungx Sep 23, 2024

niubell Sep 23, 2024

okJiang Sep 24, 2024 •

edited

Loading

rleungx Sep 24, 2024

okJiang Sep 24, 2024 •

edited

Loading

ti-chi-bot bot commented Sep 24, 2024

ti-chi-bot bot commented Sep 24, 2024

rleungx commented Sep 24, 2024

ti-chi-bot commented Sep 24, 2024

ti-chi-bot commented Sep 24, 2024

ti-chi-bot commented Sep 24, 2024

ti-chi-bot commented Sep 24, 2024

ti-chi-bot commented Sep 24, 2024

ti-chi-bot commented Sep 24, 2024

*: reset config if the input is invalid #8632

*: reset config if the input is invalid #8632

Conversation

rleungx commented Sep 14, 2024

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

lhy1024 left a comment

Choose a reason for hiding this comment

lhy1024 Sep 14, 2024

Choose a reason for hiding this comment

codecov bot commented Sep 14, 2024 • edited Loading

Codecov Report

lhy1024 Sep 14, 2024 • edited Loading

Choose a reason for hiding this comment

rleungx Sep 23, 2024

Choose a reason for hiding this comment

niubell Sep 23, 2024

Choose a reason for hiding this comment

rleungx Sep 23, 2024

Choose a reason for hiding this comment

niubell Sep 23, 2024

Choose a reason for hiding this comment

okJiang Sep 24, 2024 • edited Loading

Choose a reason for hiding this comment

rleungx Sep 24, 2024

Choose a reason for hiding this comment

okJiang Sep 24, 2024 • edited Loading

Choose a reason for hiding this comment

ti-chi-bot bot commented Sep 24, 2024

ti-chi-bot bot commented Sep 24, 2024

[LGTM Timeline notifier]

rleungx commented Sep 24, 2024

ti-chi-bot commented Sep 24, 2024

ti-chi-bot commented Sep 24, 2024

ti-chi-bot commented Sep 24, 2024

ti-chi-bot commented Sep 24, 2024

ti-chi-bot commented Sep 24, 2024

ti-chi-bot commented Sep 24, 2024

codecov bot commented Sep 14, 2024 •

edited

Loading

lhy1024 Sep 14, 2024 •

edited

Loading

okJiang Sep 24, 2024 •

edited

Loading

okJiang Sep 24, 2024 •

edited

Loading