placement: return rules after clone #3892

disksing · 2021-07-20T07:41:43Z

Signed-off-by: disksing i@disksing.com

What problem does this PR solve?

Fix #3886

What is changed and how it works?

Clone the rule before returning to callers. It should be safe to modify and update again.

Check List

Tests

Unit test
Integration test

Related changes

Need to cherry-pick to the release branch

Release note

Fix an issue where data is not stored when using max-replicas or location-labels to indirectly update default placement rule

Signed-off-by: disksing <i@disksing.com>

codecov · 2021-07-22T08:36:36Z

Codecov Report

Merging #3892 (a20fac3) into master (a2ea41c) will decrease coverage by 0.06%.
The diff coverage is 85.71%.

@@            Coverage Diff             @@
##           master    #3892      +/-   ##
==========================================
- Coverage   74.47%   74.40%   -0.07%     
==========================================
  Files         246      246              
  Lines       24854    24868      +14     
==========================================
- Hits        18509    18504       -5     
- Misses       4685     4693       +8     
- Partials     1660     1671      +11

Flag	Coverage Δ
unittests	`74.40% <85.71%> (-0.07%)`	⬇️

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

Impacted Files	Coverage Δ
server/server.go	`71.27% <50.00%> (-0.35%)`	⬇️
pkg/typeutil/comparison.go	`85.71% <60.00%> (-14.29%)`	⬇️
server/schedule/placement/rule.go	`96.15% <100.00%> (+0.40%)`	⬆️
server/schedule/placement/rule_manager.go	`83.13% <100.00%> (+0.25%)`	⬆️
server/region_syncer/server.go	`83.33% <0.00%> (-6.07%)`	⬇️
server/tso/tso.go	`57.45% <0.00%> (-4.98%)`	⬇️
pkg/etcdutil/etcdutil.go	`84.70% <0.00%> (-3.53%)`	⬇️
server/schedulers/random_merge.go	`60.00% <0.00%> (-3.34%)`	⬇️
pkg/dashboard/adapter/manager.go	`79.78% <0.00%> (-3.20%)`	⬇️
server/kv/etcd_kv.go	`69.56% <0.00%> (-2.90%)`	⬇️
... and 9 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 a2ea41c...a20fac3. Read the comment docs.

disksing · 2021-07-22T08:49:26Z

Please take a look. @HunDunDM @bufferflies

nolouch

lgtm

HunDunDM

Does Copy-on-Write perform better?

HunDunDM · 2021-07-23T04:26:24Z

server/server.go

@@ -1378,3 +1376,15 @@ func (s *Server) SaveTTLConfig(data map[string]interface{}, ttl time.Duration) e
 	}
 	return nil
 }
+
+func stringsEqual(a, b []string) bool {


Judge the situation where len is all 0, then we can still use reflect.DeepEqual directly?

Then it will be if len(a) == 0 && len(b) == 0 || reflect.DeepEqual(a, ), looks not very elegant I think.

server/server.go

disksing · 2021-07-23T05:34:12Z

Does Copy-on-Write perform better?

copy-on-write should be better. The problem is that Go does not have const, it is easy to miss use. I think for the methods that are mainly used by HTTP API, it is acceptable to clone every rule.

bufferflies · 2021-07-23T06:15:19Z

lgtm

Signed-off-by: disksing <i@disksing.com>

pkg/typeutil/comparison.go

nolouch · 2021-07-27T05:20:18Z

PTAL @HunDunDM @bufferflies

bufferflies · 2021-07-27T06:15:42Z

lgtm

ti-chi-bot · 2021-07-27T06:18:07Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

bufferflies
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.

nolouch · 2021-07-27T07:46:13Z

/merge

ti-chi-bot · 2021-07-27T07:46:14Z

@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 · 2021-07-27T07:46:15Z

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

Commit hash: 82c6b74

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

ti-chi-bot · 2021-07-27T08:00:54Z

In response to a cherrypick label: new pull request created: #3914.

ti-chi-bot · 2021-07-27T08:01:30Z

In response to a cherrypick label: new pull request created: #3915.

* placement: return rules after clone Signed-off-by: disksing <i@disksing.com> * fix test Signed-off-by: disksing <i@disksing.com> * move stringsEqual to typeutils Signed-off-by: disksing <i@disksing.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

* This is an automated cherry-pick of #3892 Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io> * resolve conflicts Signed-off-by: disksing <i@disksing.com> Co-authored-by: disksing <i@disksing.com>

* placement: return rules after clone Signed-off-by: disksing <i@disksing.com> * fix test Signed-off-by: disksing <i@disksing.com> * move stringsEqual to typeutils Signed-off-by: disksing <i@disksing.com> Co-authored-by: disksing <i@disksing.com> Co-authored-by: 混沌DM <hundundm@gmail.com>

disksing added type/bugfix This PR fixes a bug. needs-cherry-pick-release-5.0 The PR needs to cherry pick to release-5.0 branch. needs-cherry-pick-release-5.1 Type: Need cherry pick to release-5.1 labels Jul 20, 2021

disksing requested a review from HunDunDM July 20, 2021 07:41

ti-chi-bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Jul 20, 2021

disksing marked this pull request as draft July 22, 2021 07:58

ti-chi-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 22, 2021

placement: return rules after clone

9a9ca83

Signed-off-by: disksing <i@disksing.com>

disksing force-pushed the issue-3886 branch from 65bcbe6 to 9a9ca83 Compare July 22, 2021 08:08

disksing added 3 commits July 22, 2021 16:09

Merge branch 'master' into issue-3886

fd32e55

fix test

3173fcd

Signed-off-by: disksing <i@disksing.com>

Merge branch 'issue-3886' of github.com:disksing/pd into issue-3886

048c61a

disksing marked this pull request as ready for review July 22, 2021 08:36

ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 22, 2021

nolouch approved these changes Jul 22, 2021

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 22, 2021

HunDunDM reviewed Jul 23, 2021

View reviewed changes

bufferflies reviewed Jul 23, 2021

View reviewed changes

server/server.go Outdated Show resolved Hide resolved

move stringsEqual to typeutils

82c6b74

Signed-off-by: disksing <i@disksing.com>

HunDunDM reviewed Jul 23, 2021

View reviewed changes

pkg/typeutil/comparison.go Show resolved Hide resolved

bufferflies approved these changes Jul 27, 2021

View reviewed changes

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, 2021

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 27, 2021

Merge branch 'master' into issue-3886

a20fac3

ti-chi-bot merged commit 9e15727 into tikv:master Jul 27, 2021

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Jul 27, 2021

This is an automated cherry-pick of tikv#3892

5806fb9

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

ti-chi-bot mentioned this pull request Jul 27, 2021

placement: return rules after clone (#3892) #3914

Merged

ti-chi-bot mentioned this pull request Jul 27, 2021

placement: return rules after clone (#3892) #3915

Merged

disksing deleted the issue-3886 branch August 18, 2021 03:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

placement: return rules after clone #3892

placement: return rules after clone #3892

disksing commented Jul 20, 2021

codecov bot commented Jul 22, 2021 •

edited

Loading

disksing commented Jul 22, 2021

nolouch left a comment

HunDunDM left a comment

HunDunDM Jul 23, 2021

disksing Jul 23, 2021

disksing commented Jul 23, 2021 •

edited

Loading

bufferflies commented Jul 23, 2021

nolouch commented Jul 27, 2021

bufferflies commented Jul 27, 2021

ti-chi-bot commented Jul 27, 2021

nolouch commented Jul 27, 2021

ti-chi-bot commented Jul 27, 2021

ti-chi-bot commented Jul 27, 2021

ti-chi-bot commented Jul 27, 2021

ti-chi-bot commented Jul 27, 2021

placement: return rules after clone #3892

placement: return rules after clone #3892

Conversation

disksing commented Jul 20, 2021

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

codecov bot commented Jul 22, 2021 • edited Loading

Codecov Report

disksing commented Jul 22, 2021

nolouch left a comment

Choose a reason for hiding this comment

HunDunDM left a comment

Choose a reason for hiding this comment

HunDunDM Jul 23, 2021

Choose a reason for hiding this comment

disksing Jul 23, 2021

Choose a reason for hiding this comment

disksing commented Jul 23, 2021 • edited Loading

bufferflies commented Jul 23, 2021

nolouch commented Jul 27, 2021

bufferflies commented Jul 27, 2021

ti-chi-bot commented Jul 27, 2021

nolouch commented Jul 27, 2021

ti-chi-bot commented Jul 27, 2021

ti-chi-bot commented Jul 27, 2021

ti-chi-bot commented Jul 27, 2021

ti-chi-bot commented Jul 27, 2021

codecov bot commented Jul 22, 2021 •

edited

Loading

disksing commented Jul 23, 2021 •

edited

Loading