pdutil: use temp pause config by 3pointer · Pull Request #592 · pingcap/br

3pointer · 2020-11-10T05:17:22Z

What problem does this PR solve?

After tikv/pd#3088 pd support set temporary config with ttlSecond. so BR can improve the behavior of pd config setting.

What is changed and how it works?

refactor pdutil: merge all configs together
add pauseConfig for 4.0.8.

Check List

Tests

Manual test (add detailed scripts or steps below)
No code

Code changes

Has exported function/method change

Related changes

Need to cherry-pick to the release branch

Release Note

No release note.

overvenus

Rest LGTM

overvenus · 2020-11-10T05:33:27Z

 	}
+	version, err := semver.NewVersion(string(versionBytes))
+	if err != nil {
+		return nil, errors.Annotatef(err, "transform pd version failed", string(versionBytes))


Could you choose an error in pkg/errors?

3pointer · 2020-11-10T12:03:37Z

/rebuild

3pointer · 2020-11-11T05:49:02Z

/run-integration-test

kennytm · 2020-11-12T08:14:44Z

+	expectPDCfg = map[string]interface{}{
+		"max-merge-region-keys": 0,
+		"max-merge-region-size": 0,
+		// TODO remove this schedule-limits, see https://github.com/pingcap/br/pull/555#discussion_r509855972


as the rationale keeping the two -limits in #555 was

I think we could leave a TODO here and try to merge this firstly... I'm afraid that if any error occurs during editing, we cannot merge this in the current unstable CI environment...

do we still need to keep them here?

There are some misunderstanding.

leader-schedule-limit and region-schedule-limit does need in previous and current version to reduce the schedule. I'll update the comment later.

Before Persist temporary setting to etcd tikv/pd#3131 leader-schedule-limit and region-schedule-limit doesn't support ttl second. I think we should wait PD merge 3131 then test.

I want to make sure this PR is compatible with the old BR version and easy to support set pd ttl config. I'll file another PR to update config when 3131 merged.

Co-authored-by: kennytm <kennytm@gmail.com>

3pointer · 2020-11-13T06:50:50Z

/rebuild

3pointer · 2020-11-16T03:14:00Z

/rebuild

3pointer · 2020-11-16T03:22:05Z

/rebuild

3pointer · 2020-11-16T03:29:59Z

/rebuild

kennytm

rest LGTM but that's a big rest.

3pointer · 2020-11-16T06:27:00Z

/rebuild

3pointer · 2020-11-16T07:28:48Z

/run-integration-test

3pointer · 2020-11-16T07:36:32Z

/run-integration-test

3pointer · 2020-11-16T07:45:45Z

/run-integration-test

glorv · 2020-11-16T08:05:46Z

/run-integration-test

3pointer · 2020-11-16T08:25:07Z

/rebuild

3pointer · 2020-11-16T08:37:57Z

/run-integration-test

glorv · 2020-11-16T08:48:42Z

LGTM

ti-srebot · 2020-11-16T08:50:41Z

cherry pick to release-4.0 in PR #596

* pdutil: use temp pause config * refactor pdutil * fix ci * add pd version fail back * fix ci * fix ci * fix unmarshal bool * address comment * fi * add test case * Apply suggestions from code review Co-authored-by: kennytm <kennytm@gmail.com> * address comment * fix ci * update comment * update comment * Update pkg/pdutil/pd.go Co-authored-by: kennytm <kennytm@gmail.com> * address comment * change convoluted logic * resume config by set ttlSecond to 0 * test pause config * fix failpoint * update test * fix test Co-authored-by: luancheng <luancheng@pingcap.com> Co-authored-by: kennytm <kennytm@gmail.com>

pdutil: use temp pause config

d485c50

overvenus reviewed Nov 10, 2020

View reviewed changes

refactor pdutil

6f141e6

3pointer force-pushed the pd_temp_config branch 2 times, most recently from 8ac48a5 to 668a2c9 Compare November 10, 2020 09:39

fix ci

7cf0c64

3pointer force-pushed the pd_temp_config branch from 668a2c9 to 7cf0c64 Compare November 10, 2020 10:02

add pd version fail back

24f2d24

fix ci

99692eb

3pointer force-pushed the pd_temp_config branch from e63d085 to 99692eb Compare November 10, 2020 12:18

3pointer added 2 commits November 10, 2020 20:21

fix ci

682fd5f

fix unmarshal bool

64d6d4c

3pointer force-pushed the pd_temp_config branch from b3fdef9 to 64d6d4c Compare November 11, 2020 04:10

kennytm reviewed Nov 11, 2020

View reviewed changes

Comment thread pkg/pdutil/pd.go Outdated

3pointer added 2 commits November 11, 2020 12:24

address comment

30e0887

fi

571db35

3pointer marked this pull request as ready for review November 11, 2020 05:46

add test case

002f54c

3pointer force-pushed the pd_temp_config branch from f7552b6 to 002f54c Compare November 11, 2020 09:14

3pointer requested review from kennytm and overvenus November 11, 2020 09:45

3pointer added the needs-cherry-pick-release-4.0 label Nov 11, 2020

kennytm reviewed Nov 12, 2020

View reviewed changes

3pointer and others added 4 commits November 13, 2020 14:01

Apply suggestions from code review

5c64433

Co-authored-by: kennytm <kennytm@gmail.com>

address comment

0364fc5

fix ci

65febef

update comment

e198c7e

Merge branch 'master' into pd_temp_config

b9e3221

kennytm reviewed Nov 16, 2020

View reviewed changes

Comment thread pkg/pdutil/pd.go Outdated

kennytm removed the status/LGT1 LGTM1 label Nov 16, 2020

change convoluted logic

a7f0367

kennytm added the status/LGT1 LGTM1 label Nov 16, 2020

resume config by set ttlSecond to 0

a649e7f

3pointer added 3 commits November 16, 2020 15:01

test pause config

2d12659

fix failpoint

f586549

update test

7d5cd0b

fix test

9d38da6

ti-srebot removed the status/LGT1 LGTM1 label Nov 16, 2020

ti-srebot approved these changes Nov 16, 2020

View reviewed changes

ti-srebot added the status/LGT2 LGTM2 label Nov 16, 2020

3pointer merged commit e3faf51 into pingcap:master Nov 16, 2020

ti-srebot mentioned this pull request Nov 16, 2020

pdutil: use temp pause config (#592) #596

Merged

3pointer mentioned this pull request Nov 26, 2020

pd: fix parse version #620

Merged

ti-srebot mentioned this pull request Nov 26, 2020

pd: fix parse version (#620) #623

Merged

Conversation

3pointer commented Nov 10, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What problem does this PR solve?

What is changed and how it works?

Check List

Release Note

Uh oh!

overvenus left a comment

Choose a reason for hiding this comment

Uh oh!

overvenus Nov 10, 2020

Choose a reason for hiding this comment

Uh oh!

3pointer commented Nov 10, 2020

Uh oh!

Uh oh!

3pointer commented Nov 11, 2020

Uh oh!

kennytm Nov 12, 2020

Choose a reason for hiding this comment

Uh oh!

3pointer Nov 13, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

3pointer commented Nov 13, 2020

Uh oh!

3pointer commented Nov 16, 2020

Uh oh!

3pointer commented Nov 16, 2020

Uh oh!

3pointer commented Nov 16, 2020

Uh oh!

kennytm left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

3pointer commented Nov 16, 2020

Uh oh!

3pointer commented Nov 16, 2020

Uh oh!

3pointer commented Nov 16, 2020

Uh oh!

3pointer commented Nov 16, 2020

Uh oh!

glorv commented Nov 16, 2020

Uh oh!

3pointer commented Nov 16, 2020

Uh oh!

3pointer commented Nov 16, 2020

Uh oh!

glorv commented Nov 16, 2020

Uh oh!

ti-srebot commented Nov 16, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

3pointer commented Nov 10, 2020 •

edited

Loading