From 0f26f76e1f421e506d35d8dd38e73a322e001b9f Mon Sep 17 00:00:00 2001 From: husharp Date: Wed, 3 Jul 2024 10:43:14 +0800 Subject: [PATCH 01/14] fix Signed-off-by: husharp --- tests/server/region_syncer/region_syncer_test.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/server/region_syncer/region_syncer_test.go b/tests/server/region_syncer/region_syncer_test.go index f82346571ef..269a2eabf65 100644 --- a/tests/server/region_syncer/region_syncer_test.go +++ b/tests/server/region_syncer/region_syncer_test.go @@ -236,9 +236,10 @@ func TestPrepareChecker(t *testing.T) { re.NoError(err) // waiting for synchronization to complete time.Sleep(3 * time.Second) + leaderServer = cluster.GetLeaderServer() err = cluster.ResignLeader() re.NoError(err) - re.Equal("pd2", cluster.WaitLeader()) + re.NotEqual(leaderServer.GetServer().Name(), cluster.WaitLeader()) leaderServer = cluster.GetLeaderServer() rc = leaderServer.GetServer().GetRaftCluster() for _, region := range regions { @@ -284,14 +285,19 @@ func TestPrepareCheckerWithTransferLeader(t *testing.T) { re.NoError(err) // waiting for synchronization to complete time.Sleep(3 * time.Second) + leaderServer = cluster.GetLeaderServer() err = cluster.ResignLeader() re.NoError(err) - re.Equal("pd2", cluster.WaitLeader()) + re.NotEqual(leaderServer.GetServer().Name(), cluster.WaitLeader()) + rc = cluster.GetLeaderServer().GetRaftCluster() + re.True(rc.IsPrepared()) - // transfer leader to pd1, can start coordinator immediately. + // transfer leader, can start coordinator immediately. + leaderServer = cluster.GetLeaderServer() err = cluster.ResignLeader() re.NoError(err) - re.Equal("pd1", cluster.WaitLeader()) + re.NotEqual(leaderServer.GetLeader().GetName(), cluster.WaitLeader()) + rc = cluster.GetLeaderServer().GetServer().GetRaftCluster() re.True(rc.IsPrepared()) re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/schedule/changeCoordinatorTicker")) } From bbca80df9f30a7198f9aa73af6b7b5e502f7962c Mon Sep 17 00:00:00 2001 From: husharp Date: Wed, 3 Jul 2024 10:53:04 +0800 Subject: [PATCH 02/14] fix Signed-off-by: husharp --- Makefile | 2 +- scripts/ci-subtask.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 25628a13736..2f83521f9b0 100644 --- a/Makefile +++ b/Makefile @@ -254,7 +254,7 @@ basic-test: install-tools ci-test-job: install-tools dashboard-ui pd-ut @$(FAILPOINT_ENABLE) - ./scripts/ci-subtask.sh $(JOB_COUNT) $(JOB_INDEX) || { $(FAILPOINT_DISABLE); exit 1; } + ./scripts/ci-subtask.sh 4 || { $(FAILPOINT_DISABLE); exit 1; } @$(FAILPOINT_DISABLE) TSO_INTEGRATION_TEST_PKGS := $(PD_PKG)/tests/server/tso diff --git a/scripts/ci-subtask.sh b/scripts/ci-subtask.sh index 1709b97f437..3663ed7f810 100755 --- a/scripts/ci-subtask.sh +++ b/scripts/ci-subtask.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# ./ci-subtask.sh +# ./ci-subtask.sh ROOT_PATH_COV=$(pwd)/covprofile ROOT_PATH_JUNITFILE=$(pwd)/junitfile From 498fb5d7d03c3635b5d700d12d794ed334f94bea Mon Sep 17 00:00:00 2001 From: husharp Date: Wed, 3 Jul 2024 11:01:05 +0800 Subject: [PATCH 03/14] test_1 From b0259f59adaca35e7f38d535e02f6ecb01c3ce93 Mon Sep 17 00:00:00 2001 From: husharp Date: Wed, 3 Jul 2024 11:11:11 +0800 Subject: [PATCH 04/14] test_2 From 646cba75892788b6f06e757fb996aa5ad428cb17 Mon Sep 17 00:00:00 2001 From: husharp Date: Wed, 3 Jul 2024 11:28:33 +0800 Subject: [PATCH 05/14] fix Signed-off-by: husharp --- tests/server/region_syncer/region_syncer_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/server/region_syncer/region_syncer_test.go b/tests/server/region_syncer/region_syncer_test.go index 269a2eabf65..4803f7e6823 100644 --- a/tests/server/region_syncer/region_syncer_test.go +++ b/tests/server/region_syncer/region_syncer_test.go @@ -234,6 +234,7 @@ func TestPrepareChecker(t *testing.T) { re.NoError(err) err = pd2.Run() re.NoError(err) + re.NotEmpty(cluster.WaitLeader()) // waiting for synchronization to complete time.Sleep(3 * time.Second) leaderServer = cluster.GetLeaderServer() @@ -283,6 +284,7 @@ func TestPrepareCheckerWithTransferLeader(t *testing.T) { re.NoError(err) err = pd2.Run() re.NoError(err) + re.NotEmpty(cluster.WaitLeader()) // waiting for synchronization to complete time.Sleep(3 * time.Second) leaderServer = cluster.GetLeaderServer() From ddfd78dd9e71cfa784c79fcf31209c12500258de Mon Sep 17 00:00:00 2001 From: husharp Date: Wed, 3 Jul 2024 11:36:43 +0800 Subject: [PATCH 06/14] test_1 From 3680abeea4c0d52489cb2f191f09b305e4104fb7 Mon Sep 17 00:00:00 2001 From: husharp Date: Wed, 3 Jul 2024 11:46:49 +0800 Subject: [PATCH 07/14] test_2 From df2b586a81f2f0ebc3ea2d911456c44855118ebb Mon Sep 17 00:00:00 2001 From: husharp Date: Wed, 3 Jul 2024 12:01:38 +0800 Subject: [PATCH 08/14] test_3 From e1e8491b1b4576cd4682d62e57262237622fd8f0 Mon Sep 17 00:00:00 2001 From: husharp Date: Wed, 3 Jul 2024 12:50:33 +0800 Subject: [PATCH 09/14] test_3 From 562426267c0c2436bec76644e25f44634504cb7f Mon Sep 17 00:00:00 2001 From: husharp Date: Wed, 3 Jul 2024 12:58:02 +0800 Subject: [PATCH 10/14] test_4 From e67670745d5885030f003f3f4698a30b7499a0c2 Mon Sep 17 00:00:00 2001 From: husharp Date: Wed, 3 Jul 2024 13:08:08 +0800 Subject: [PATCH 11/14] test_5 From 09f5a1c8c6d7a843da6aaec8ff8599f4c0890086 Mon Sep 17 00:00:00 2001 From: husharp Date: Wed, 3 Jul 2024 13:22:50 +0800 Subject: [PATCH 12/14] test_6 From 4cb4cf20d814ea08c50707a10b8411b5fb3b74de Mon Sep 17 00:00:00 2001 From: husharp Date: Wed, 3 Jul 2024 13:32:56 +0800 Subject: [PATCH 13/14] test_7 From 2dc7a7c356e38aeb6a6c022ae169f9cdedcffd49 Mon Sep 17 00:00:00 2001 From: husharp Date: Wed, 3 Jul 2024 13:43:03 +0800 Subject: [PATCH 14/14] test_8