This is an automated cherry-pick of #8663

ref #8619 Signed-off-by: ti-chi-bot <[email protected]>
tikv · Sep 24, 2024 · 661eed1 · 661eed1
1 parent 14d99f6
commit 661eed1
Show file tree

Hide file tree

Showing 8 changed files with 5,553 additions and 0 deletions.
diff --git a/pkg/schedule/schedulers/evict_leader.go b/pkg/schedule/schedulers/evict_leader.go
diff --git a/server/schedulers/grant_leader.go b/server/schedulers/grant_leader.go
@@ -289,7 +289,19 @@ func (handler *grantLeaderHandler) UpdateConfig(w http.ResponseWriter, r *http.R
 	handler.config.BuildWithArgs(args)
 	err := handler.config.Persist()
 	if err != nil {
+<<<<<<< HEAD:server/schedulers/grant_leader.go
 		handler.config.removeStore(id)
+=======
+		handler.config.Lock()
+		handler.config.cluster.ResumeLeaderTransfer(id)
+		handler.config.Unlock()
+		handler.rd.JSON(w, http.StatusBadRequest, err.Error())
+		return
+	}
+	err = handler.config.persist()
+	if err != nil {
+		_, _ = handler.config.removeStore(id)
+>>>>>>> f3e9d9ad0 (*: let TestEvictLeaderScheduler run in two modes (#8663)):pkg/schedule/schedulers/grant_leader.go
 		handler.rd.JSON(w, http.StatusInternalServerError, err.Error())
 		return
 	}