make TestUpdateDefaultReplicaConfig stable

Signed-off-by: Ryan Leung <[email protected]>

server/api/config.go

@@ -62,7 +62,7 @@ func newConfHandler(svr *server.Server, rd *render.Render) *confHandler {
 // @Router   /config [get]
 func (h *confHandler) GetConfig(w http.ResponseWriter, r *http.Request) {
 	cfg := h.svr.GetConfig()
-	if h.svr.IsAPIServiceMode() {
+	if h.svr.IsServiceIndependent(utils.SchedulingServiceName) {
 		schedulingServerConfig, err := h.GetSchedulingServerConfig()
 		if err != nil {
 			h.rd.JSON(w, http.StatusInternalServerError, err.Error())
@@ -313,7 +313,7 @@ func getConfigMap(cfg map[string]interface{}, key []string, value interface{}) m
 // @Success  200  {object}  sc.ScheduleConfig
 // @Router   /config/schedule [get]
 func (h *confHandler) GetScheduleConfig(w http.ResponseWriter, r *http.Request) {
-	if h.svr.IsAPIServiceMode() {
+	if h.svr.IsServiceIndependent(utils.SchedulingServiceName) {
 		cfg, err := h.GetSchedulingServerConfig()
 		if err != nil {
 			h.rd.JSON(w, http.StatusInternalServerError, err.Error())
@@ -386,7 +386,7 @@ func (h *confHandler) SetScheduleConfig(w http.ResponseWriter, r *http.Request)
 // @Success  200  {object}  sc.ReplicationConfig
 // @Router   /config/replicate [get]
 func (h *confHandler) GetReplicationConfig(w http.ResponseWriter, r *http.Request) {
-	if h.svr.IsAPIServiceMode() {
+	if h.svr.IsServiceIndependent(utils.SchedulingServiceName) {
 		cfg, err := h.GetSchedulingServerConfig()
 		if err != nil {
 			h.rd.JSON(w, http.StatusInternalServerError, err.Error())

server/apiv2/middlewares/redirector.go

@@ -31,8 +31,7 @@ func Redirector() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		svr := c.MustGet(ServerContextKey).(*server.Server)
 		allowFollowerHandle := len(c.Request.Header.Get(apiutil.PDAllowFollowerHandleHeader)) > 0
-		isLeader := svr.GetMember().IsLeader()
-		if !svr.IsClosed() && (allowFollowerHandle || isLeader) {
+		if !svr.IsClosed() && (allowFollowerHandle || svr.GetMember().IsLeader()) {
 			c.Next()
 			return
 		}