test: add etcd key compatibility test #9126

okJiang · 2025-03-10T06:18:35Z

What problem does this PR solve?

Issue Number: Ref #9127

What is changed and how does it work?

This PR introduces a new etcd key compatibility test, with its test data based on release 8.5. It is only for reviewing the code of this test, so I have not enabled it. In the next PR, I will fix the changes to the etcd keys from release 8.5 to master and provide source explanations for those changes. I has updated the test data using master code, and enable this test.

Code Overview: I used failpoint to collect the operation of keys during the test and saved the results to a file. If the results from the new code do not match those in the file, it indicates that the operations on the keys have changed during testing. This compels us to pay attention to changes in the keys.

Check List

Tests

Unit test
Integration test

Please refer to the test results here; they are based on test data generated from the release-8.5 code.

Release note

None.

close tikv#8781 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: lhy1024 <admin@liudos.us>

ref tikv#8781 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: lhy1024 <admin@liudos.us>

…ikv#8837) (tikv#8838) close tikv#8836 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: lhy1024 <admin@liudos.us>

…) (tikv#8857) close tikv#8854 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: lhy1024 <admin@liudos.us>

close tikv#8823 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>

…part2) (tikv#8885) (tikv#8890) ref tikv#8477, close tikv#8889 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: lhy1024 <admin@liudos.us>

tikv#8772) ref tikv#4257 Signed-off-by: baurine <2008.hbl@gmail.com> Co-authored-by: baurine <2008.hbl@gmail.com> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

close tikv#8950 Signed-off-by: okJiang <819421878@qq.com> Co-authored-by: okJiang <819421878@qq.com>

) (tikv#8973) close tikv#8756 Signed-off-by: okJiang <819421878@qq.com> Co-authored-by: okJiang <819421878@qq.com>

…ikv#8963) (tikv#8974) close tikv#8962 Signed-off-by: okJiang <819421878@qq.com> Co-authored-by: okJiang <819421878@qq.com> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

…fig (tikv#8981) (tikv#8985) close tikv#8980 server/config: completely remove the deprecated field from the PD server config Signed-off-by: nolouch <nolouch@gmail.com> Co-authored-by: nolouch <nolouch@gmail.com>

close tikv#9017 Signed-off-by: Ryan Leung <rleungx@gmail.com> Co-authored-by: Ryan Leung <rleungx@gmail.com>

close tikv#9020 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: lhy1024 <admin@liudos.us> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

close tikv#9091 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: lhy1024 <admin@liudos.us>

Signed-off-by: okJiang <819421878@qq.com>

ti-chi-bot · 2025-03-10T06:18:38Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

okJiang · 2025-03-10T08:09:18Z

/retest

okJiang · 2025-03-10T08:36:21Z

/retest

Signed-off-by: okJiang <819421878@qq.com>

lhy1024 · 2025-03-14T08:05:54Z

pkg/utils/etcdutil/etcdutil.go

+func InjectFailToCollectTestEtcdKey(key, op string) {
+	failpoint.Inject("CollectEtcdKey", func(val failpoint.Value) {
+		file := val.(string)
+		fmt.Println("collect etcd key", file, key, op)


Do we need to output it?

lhy1024 · 2025-03-14T08:07:49Z

tools/pd-ut/testdata/group.1.etcdkey

@@ -0,0 +1,75 @@
+ get


Are these files necessary? How will we maintain them?

How about adding a script to generate it?

It will be print after execute ./scripts/ci-subtask.sh {group_id}. So we can see it in the github action

BTW: the code is in https://github.com/okJiang/pd/blob/7025e1f6144f5f6e40546246e97b452e11d1329f/tools/pd-ut/ut.go#L419. If diff exists, it will also print https://github.com/okJiang/pd/blob/7025e1f6144f5f6e40546246e97b452e11d1329f/tools/pd-ut/ut.go#L421-L437

How will we maintain them?

If the ci failed, we can copy the log to the xxxx.etcdkey

Signed-off-by: okJiang <819421878@qq.com>

ti-chi-bot · 2025-03-18T05:44:12Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lhy1024, nolouch

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,nolouch]

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 · 2025-03-18T05:44:14Z

[LGTM Timeline notifier]

Timeline:

2025-03-17 09:52:34.121835591 +0000 UTC m=+262847.806071682: ☑️ agreed by nolouch.
2025-03-18 05:44:13.686642327 +0000 UTC m=+334347.370878423: ☑️ agreed by lhy1024.

ti-chi-bot and others added 25 commits November 7, 2024 07:24

cluster: fix tso fallback when pd leader switch (tikv#8783) (tikv#8784)

051907b

close tikv#8781 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: lhy1024 <admin@liudos.us>

cluster: avoid unexpect scheduling job start (tikv#8794) (tikv#8796)

fb992f9

ref tikv#8781 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: lhy1024 <admin@liudos.us>

cluster: fix tso fallback due raft cluster did not stop tso service (t…

3994172

…ikv#8837) (tikv#8838) close tikv#8836 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: lhy1024 <admin@liudos.us>

cluster: avoiding large numbers of logs in check tso service (tikv#8855…

ac87a00

…) (tikv#8857) close tikv#8854 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: lhy1024 <admin@liudos.us>

syncer: exit watch leader immediately (tikv#8824) (tikv#8831)

c0daa90

close tikv#8823 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>

cluster: fix tso fallback due raft cluster did not stop tso service (…

d190c0e

…part2) (tikv#8885) (tikv#8890) ref tikv#8477, close tikv#8889 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: lhy1024 <admin@liudos.us>

chore(dashboard): update TiDB Dashboard to v8.5.0-bce95733 (tikv#8764) (

98df926

tikv#8772) ref tikv#4257 Signed-off-by: baurine <2008.hbl@gmail.com> Co-authored-by: baurine <2008.hbl@gmail.com> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

server: advance ServerStart check (tikv#8951) (tikv#8971)

d62b7b6

close tikv#8950 Signed-off-by: okJiang <819421878@qq.com> Co-authored-by: okJiang <819421878@qq.com>

scheduler: add test for creating evict-leader-scheduler twice (tikv#8757

fed784a

) (tikv#8973) close tikv#8756 Signed-off-by: okJiang <819421878@qq.com> Co-authored-by: okJiang <819421878@qq.com>

client: retry checkServiceModeChanged to make tso client work normal (t…

43949da

…ikv#8963) (tikv#8974) close tikv#8962 Signed-off-by: okJiang <819421878@qq.com> Co-authored-by: okJiang <819421878@qq.com> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

config: completely remove the deprecated field from the PD server con…

5036cc2

…fig (tikv#8981) (tikv#8985) close tikv#8980 server/config: completely remove the deprecated field from the PD server config Signed-off-by: nolouch <nolouch@gmail.com> Co-authored-by: nolouch <nolouch@gmail.com>

syncer: exit broadcast as soon as possible (tikv#9018) (tikv#9074)

20dd6ba

close tikv#9017 Signed-off-by: Ryan Leung <rleungx@gmail.com> Co-authored-by: Ryan Leung <rleungx@gmail.com>

tso: add retry for UpdateTSO (tikv#9021) (tikv#9066)

727c208

close tikv#9020 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: lhy1024 <admin@liudos.us> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

mcs: add lock for forward tso stream (tikv#9095) (tikv#9106)

2da8160

close tikv#9091 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: lhy1024 <admin@liudos.us>

add etcd key compatibility test

e6f52b1

Signed-off-by: okJiang <819421878@qq.com>

fix file path

2997ade

Signed-off-by: okJiang <819421878@qq.com>

add testdata

31787de

Signed-off-by: okJiang <819421878@qq.com>

add testdata

b843820

Signed-off-by: okJiang <819421878@qq.com>

add testdata

a5b7e40

Signed-off-by: okJiang <819421878@qq.com>

fix group 8

30b14df

Signed-off-by: okJiang <819421878@qq.com>

fix group 1

ab9dbcf

Signed-off-by: okJiang <819421878@qq.com>

add group3

035e7f9

Signed-off-by: okJiang <819421878@qq.com>

remove empty line

3d78578

Signed-off-by: okJiang <819421878@qq.com>

add group5

27fdca9

Signed-off-by: okJiang <819421878@qq.com>

add group4

b432211

Signed-off-by: okJiang <819421878@qq.com>

ti-chi-bot bot removed the do-not-merge/needs-linked-issue label Mar 10, 2025

okJiang changed the title ~~[draft] test: add etcd key compatibility test~~ test: add etcd key compatibility test Mar 10, 2025

okJiang marked this pull request as ready for review March 10, 2025 08:30

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

okJiang added 3 commits March 10, 2025 18:10

add watch

d121af7

Signed-off-by: okJiang <819421878@qq.com>

fix op

2deab4c

Signed-off-by: okJiang <819421878@qq.com>

add testdata after fix op

60b8448

Signed-off-by: okJiang <819421878@qq.com>

okJiang mentioned this pull request Mar 11, 2025

keypath: fix incorrect key #9133

Merged

Merge branch '8.5-etcd-test' into master-etcd-test-2

fbe6877

okJiang force-pushed the master-etcd-test branch from 048a723 to fbe6877 Compare March 12, 2025 08:57

okJiang added 5 commits March 12, 2025 17:08

fix static

e50ec54

Signed-off-by: okJiang <819421878@qq.com>

add test data and fix lint

b7895cd

Signed-off-by: okJiang <819421878@qq.com>

add group4/5 testdata

9ba89c7

Signed-off-by: okJiang <819421878@qq.com>

fix ci

b8ff43a

Signed-off-by: okJiang <819421878@qq.com>

fix lint

7025e1f

Signed-off-by: okJiang <819421878@qq.com>

lhy1024 reviewed Mar 14, 2025

View reviewed changes

fix comment: remove useless print

81f5d6f

Signed-off-by: okJiang <819421878@qq.com>

nolouch approved these changes Mar 17, 2025

View reviewed changes

ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Mar 17, 2025

lhy1024 approved these changes Mar 18, 2025

View reviewed changes

ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Mar 18, 2025

Merge branch 'master' into master-etcd-test

e479e42

ti-chi-bot bot merged commit 65a3377 into tikv:master Mar 18, 2025
24 of 25 checks passed

okJiang deleted the master-etcd-test branch March 18, 2025 06:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

test: add etcd key compatibility test #9126

test: add etcd key compatibility test #9126

Uh oh!

okJiang commented Mar 10, 2025 •

edited

Loading

Uh oh!

ti-chi-bot bot commented Mar 10, 2025

Uh oh!

okJiang commented Mar 10, 2025

Uh oh!

okJiang commented Mar 10, 2025

Uh oh!

lhy1024 Mar 14, 2025

Uh oh!

okJiang Mar 17, 2025

Uh oh!

lhy1024 Mar 14, 2025

Uh oh!

nolouch Mar 14, 2025

Uh oh!

okJiang Mar 17, 2025

Uh oh!

ti-chi-bot bot commented Mar 18, 2025

Uh oh!

ti-chi-bot bot commented Mar 18, 2025

Uh oh!

Uh oh!

Uh oh!

test: add etcd key compatibility test #9126

test: add etcd key compatibility test #9126

Uh oh!

Conversation

okJiang commented Mar 10, 2025 • 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 does it work?

Check List

Release note

Uh oh!

ti-chi-bot bot commented Mar 10, 2025

Uh oh!

okJiang commented Mar 10, 2025

Uh oh!

okJiang commented Mar 10, 2025

Uh oh!

lhy1024 Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

okJiang Mar 17, 2025

Choose a reason for hiding this comment

Uh oh!

lhy1024 Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

nolouch Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

okJiang Mar 17, 2025

Choose a reason for hiding this comment

Uh oh!

ti-chi-bot bot commented Mar 18, 2025

Uh oh!

ti-chi-bot bot commented Mar 18, 2025

[LGTM Timeline notifier]

Uh oh!

Uh oh!

Uh oh!

okJiang commented Mar 10, 2025 •

edited

Loading