fix conflict

Signed-off-by: okJiang <819421878@qq.com>
ti-chi-bot · Nov 6, 2024 · 62d5721 · 62d5721
1 parent c750c8f
commit 62d5721
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 22 deletions.
diff --git a/pkg/schedule/schedulers/evict_leader.go b/pkg/schedule/schedulers/evict_leader.go
@@ -75,14 +75,7 @@ func (conf *evictLeaderSchedulerConfig) getStores() []uint64 {
 }
 
 func (conf *evictLeaderSchedulerConfig) BuildWithArgs(args []string) error {
-<<<<<<< HEAD
-	if len(args) != 1 {
-=======
-	failpoint.Inject("buildWithArgsErr", func() {
-		failpoint.Return(errors.New("fail to build with args"))
-	})
 	if len(args) < 1 {
->>>>>>> 10e4889ca (scheduler: use right check for evict/grant leader scheduler (#8758))
 		return errs.ErrSchedulerConfig.FastGenByArgs("id")
 	}
 

diff --git a/pkg/schedule/schedulers/init.go b/pkg/schedule/schedulers/init.go
@@ -118,13 +118,8 @@ func schedulersRegister() {
 
 	// evict leader
 	RegisterSliceDecoderBuilder(EvictLeaderType, func(args []string) ConfigDecoder {
-<<<<<<< HEAD
 		return func(v any) error {
-			if len(args) != 1 {
-=======
-		return func(v interface{}) error {
 			if len(args) < 1 {
->>>>>>> 10e4889ca (scheduler: use right check for evict/grant leader scheduler (#8758))
 				return errs.ErrSchedulerConfig.FastGenByArgs("id")
 			}
 			conf, ok := v.(*evictLeaderSchedulerConfig)
@@ -241,13 +236,8 @@ func schedulersRegister() {
 
 	// grant leader
 	RegisterSliceDecoderBuilder(GrantLeaderType, func(args []string) ConfigDecoder {
-<<<<<<< HEAD
 		return func(v any) error {
-			if len(args) != 1 {
-=======
-		return func(v interface{}) error {
 			if len(args) < 1 {
->>>>>>> 10e4889ca (scheduler: use right check for evict/grant leader scheduler (#8758))
 				return errs.ErrSchedulerConfig.FastGenByArgs("id")
 			}
 

diff --git a/plugin/scheduler_example/evict_leader.go b/plugin/scheduler_example/evict_leader.go
@@ -46,13 +46,8 @@ const (
 
 func init() {
 	schedulers.RegisterSliceDecoderBuilder(EvictLeaderType, func(args []string) schedulers.ConfigDecoder {
-<<<<<<< HEAD
 		return func(v any) error {
-			if len(args) != 1 {
-=======
-		return func(v interface{}) error {
 			if len(args) < 1 {
->>>>>>> 10e4889ca (scheduler: use right check for evict/grant leader scheduler (#8758))
 				return errors.New("should specify the store-id")
 			}
 			conf, ok := v.(*evictLeaderSchedulerConfig)