test: reduce redundant code about etcd server and logger #7007

lhy1024 · 2023-08-30T04:53:00Z

What problem does this PR solve?

Issue Number: Close #6890 #6936

What is changed and how does it work?

Check List

Tests

Unit test

Release note

None.

Signed-off-by: lhy1024 <admin@liudos.us>

ti-chi-bot · 2023-08-30T04:53:01Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

JmPotato
rleungx

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.

Signed-off-by: lhy1024 <admin@liudos.us>

pkg/utils/etcdutil/etcdutil_test.go

rleungx · 2023-08-30T06:28:25Z

pkg/utils/etcdutil/testutil.go

+	// Start the new etcd member.
+	etcd2, err := embed.StartEtcd(cfg2)
+	if err != nil {
+		re.Contains(err.Error(), "error validating peerURLs")


When will this error happen?

In #6890, it occurs with "member count is unequal"

Is the error expected?

No, we have sent MemberAdd before starting a new etcd server, but it still returns error validating peerURLs with member count is unequal in #6890 case, which frequency is extremely low, only appearing once.

Signed-off-by: lhy1024 <admin@liudos.us>

codecov · 2023-08-30T06:46:20Z

Codecov Report

Merging #7007 (3923233) into master (91648e5) will decrease coverage by 0.10%.
The diff coverage is 98.24%.

@@            Coverage Diff             @@
##           master    #7007      +/-   ##
==========================================
- Coverage   74.46%   74.37%   -0.10%     
==========================================
  Files         435      435              
  Lines       46218    46264      +46     
==========================================
- Hits        34418    34408      -10     
- Misses       8796     8838      +42     
- Partials     3004     3018      +14

Flag	Coverage Δ
unittests	`74.37% <98.24%> (-0.10%)`	⬇️

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

Signed-off-by: lhy1024 <admin@liudos.us>

rleungx · 2023-09-01T06:17:48Z

pkg/utils/etcdutil/testutil.go

+}
+
+// MustAddEtcdMember is used to add a new etcd member to the cluster.
+func MustAddEtcdMember(t *testing.T, cfg1 *embed.Config, client *clientv3.Client) *embed.Etcd {


Why call it Mustxxx?

Do you have any good ideas about the name of this test function?

Here is no guarantee that the member is added.

It will retry three times, and if it fails all three times, it will report an error re.NoError(err, "addEtcdMemberWithRetry failed after retry")

I use another way to make the test stable, which is to wait member number to be normal before adding a new node.

Signed-off-by: lhy1024 <admin@liudos.us>

lhy1024 · 2023-09-02T16:31:27Z

I tried to run ci 200 times with CGO_ENABLED=1 go test -timeout=15m -tags deadlock -race github.com/tikv/pd/pkg/election github.com/tikv/pd/pkg/utils/etcdutil in lhy1024#9

And only met once failure in TestEtcdScaleInAndOut about #6892 and no other error about this pr.

Signed-off-by: lhy1024 <admin@liudos.us>

lhy1024 · 2023-09-04T07:25:01Z

/merge

ti-chi-bot · 2023-09-04T07:25:03Z

@lhy1024: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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 · 2023-09-04T07:25:05Z

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

Commit hash: 3923233

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

lhy1024 added 2 commits August 30, 2023 12:40

refactor etcd test server

5bfd4a1

Signed-off-by: lhy1024 <admin@liudos.us>

refactor InitLogger

60e5f07

Signed-off-by: lhy1024 <admin@liudos.us>

ti-chi-bot bot added do-not-merge/needs-linked-issue release-note-none labels Aug 30, 2023

ti-chi-bot bot requested review from JmPotato and rleungx August 30, 2023 04:53

ti-chi-bot bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Aug 30, 2023

fix lint

b22a84e

Signed-off-by: lhy1024 <admin@liudos.us>

JmPotato approved these changes Aug 30, 2023

View reviewed changes

ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 30, 2023

fix tikv#6890

11f0a90

Signed-off-by: lhy1024 <admin@liudos.us>

ti-chi-bot bot removed the do-not-merge/needs-linked-issue label Aug 30, 2023

rleungx reviewed Aug 30, 2023

View reviewed changes

pkg/utils/etcdutil/etcdutil_test.go Outdated Show resolved Hide resolved

rleungx reviewed Aug 30, 2023

View reviewed changes

fix test

4ccfaf6

Signed-off-by: lhy1024 <admin@liudos.us>

address comments

4af12f3

Signed-off-by: lhy1024 <admin@liudos.us>

rleungx reviewed Sep 1, 2023

View reviewed changes

remove recursion

b68b701

Signed-off-by: lhy1024 <admin@liudos.us>

lhy1024 requested a review from rleungx September 4, 2023 02:25

Merge branch 'master' of github.com:tikv/pd into etcd-test

3923233

Signed-off-by: lhy1024 <admin@liudos.us>

rleungx approved these changes Sep 4, 2023

View reviewed changes

ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 4, 2023

ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 4, 2023

ti-chi-bot bot merged commit e1fd64e into tikv:master Sep 4, 2023
26 checks passed

lhy1024 mentioned this pull request Sep 4, 2023

TestExitWatch is unstable #6936

Closed

rleungx pushed a commit to rleungx/pd that referenced this pull request Dec 1, 2023

test: reduce redundant code about etcd server and logger (tikv#7007)

74e95e0

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: reduce redundant code about etcd server and logger #7007

test: reduce redundant code about etcd server and logger #7007

lhy1024 commented Aug 30, 2023 •

edited

ti-chi-bot bot commented Aug 30, 2023 •

edited

rleungx Aug 30, 2023

lhy1024 Aug 30, 2023

rleungx Aug 30, 2023

lhy1024 Aug 30, 2023 •

edited

codecov bot commented Aug 30, 2023 •

edited

rleungx Sep 1, 2023

lhy1024 Sep 1, 2023

rleungx Sep 1, 2023

lhy1024 Sep 1, 2023

lhy1024 Sep 4, 2023

lhy1024 commented Sep 2, 2023

lhy1024 commented Sep 4, 2023

ti-chi-bot bot commented Sep 4, 2023

ti-chi-bot bot commented Sep 4, 2023

test: reduce redundant code about etcd server and logger #7007

test: reduce redundant code about etcd server and logger #7007

Conversation

lhy1024 commented Aug 30, 2023 • edited

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

ti-chi-bot bot commented Aug 30, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lhy1024 Aug 30, 2023 • edited

Choose a reason for hiding this comment

codecov bot commented Aug 30, 2023 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lhy1024 commented Sep 2, 2023

lhy1024 commented Sep 4, 2023

ti-chi-bot bot commented Sep 4, 2023

ti-chi-bot bot commented Sep 4, 2023

lhy1024 commented Aug 30, 2023 •

edited

ti-chi-bot bot commented Aug 30, 2023 •

edited

lhy1024 Aug 30, 2023 •

edited

codecov bot commented Aug 30, 2023 •

edited