-
Notifications
You must be signed in to change notification settings - Fork 730
scheduler: add test for creating evict-leader-scheduler twice #8757
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
af27209
add test
okJiang e4c3fb0
fix grant leader
okJiang 35f384f
change error check
okJiang 98d7845
wait more
okJiang f9197a6
update log dir
okJiang fd26b01
add test log
okJiang 2e99624
Merge branch 'master' of https://github.com/tikv/pd into evict-leader…
okJiang fd07918
remove empty line
okJiang c310404
remove some log
okJiang 70fe36c
remove
okJiang db4c335
Merge branch 'master' into evict-leader-donot-work
ti-chi-bot[bot] bc1ad24
Merge branch 'master' into evict-leader-donot-work
ti-chi-bot[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,12 +21,14 @@ import ( | |
"testing" | ||
"time" | ||
|
||
"github.com/pingcap/log" | ||
"github.com/stretchr/testify/require" | ||
"github.com/stretchr/testify/suite" | ||
"github.com/tikv/pd/client/http" | ||
"github.com/tikv/pd/client/utils/testutil" | ||
"github.com/tikv/pd/pkg/schedule/labeler" | ||
"github.com/tikv/pd/pkg/schedule/types" | ||
"go.uber.org/zap" | ||
) | ||
|
||
type schedulerSuite struct { | ||
|
@@ -201,3 +203,72 @@ func (s *schedulerSuite) TestRegionLabelDenyScheduler() { | |
return true | ||
}, testutil.WithWaitFor(time.Minute)) | ||
} | ||
|
||
func (s *schedulerSuite) TestGrantOrEvictLeaderTwice() { | ||
re := require.New(s.T()) | ||
ctx, cancel := context.WithCancel(context.Background()) | ||
defer cancel() | ||
|
||
pdHTTPCli := http.NewClient("pd-real-cluster-test", getPDEndpoints(s.T())) | ||
regions, err := pdHTTPCli.GetRegions(ctx) | ||
re.NoError(err) | ||
re.NotEmpty(regions.Regions) | ||
region1 := regions.Regions[0] | ||
|
||
var i int | ||
evictLeader := func() { | ||
re.NoError(pdHTTPCli.CreateScheduler(ctx, types.EvictLeaderScheduler.String(), uint64(region1.Leader.StoreID))) | ||
// if the second evict leader scheduler cause the pause-leader-filter | ||
// disable, the balance-leader-scheduler need some time to transfer | ||
// leader. See details in https://github.com/tikv/pd/issues/8756. | ||
if i == 1 { | ||
time.Sleep(3 * time.Second) | ||
} | ||
testutil.Eventually(re, func() bool { | ||
regions, err := pdHTTPCli.GetRegions(ctx) | ||
if err != nil { | ||
log.Error("get regions failed", zap.Error(err)) | ||
return false | ||
} | ||
for _, region := range regions.Regions { | ||
if region.Leader.StoreID == region1.Leader.StoreID { | ||
return false | ||
} | ||
} | ||
return true | ||
}, testutil.WithWaitFor(time.Minute)) | ||
|
||
i++ | ||
} | ||
|
||
evictLeader() | ||
evictLeader() | ||
pdHTTPCli.DeleteScheduler(ctx, types.EvictLeaderScheduler.String()) | ||
|
||
i = 0 | ||
grantLeader := func() { | ||
re.NoError(pdHTTPCli.CreateScheduler(ctx, types.GrantLeaderScheduler.String(), uint64(region1.Leader.StoreID))) | ||
if i == 1 { | ||
time.Sleep(3 * time.Second) | ||
} | ||
Comment on lines
+251
to
+253
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ditto. |
||
testutil.Eventually(re, func() bool { | ||
regions, err := pdHTTPCli.GetRegions(ctx) | ||
if err != nil { | ||
log.Error("get regions failed", zap.Error(err)) | ||
return false | ||
} | ||
for _, region := range regions.Regions { | ||
if region.Leader.StoreID != region1.Leader.StoreID { | ||
return false | ||
} | ||
} | ||
return true | ||
}, testutil.WithWaitFor(2*time.Minute)) | ||
|
||
i++ | ||
} | ||
|
||
grantLeader() | ||
grantLeader() | ||
pdHTTPCli.DeleteScheduler(ctx, types.GrantLeaderScheduler.String()) | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should cover this kind of waiting inside the
testutil.Eventually
below.