diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 498312c1be7..865568236aa 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,5 +1,5 @@
 <!--
-Thank you for working on PD! Please read PD's [CONTRIBUTING](https://github.com/pingcap/pd/blob/master/CONTRIBUTING.md) document **BEFORE** filing this PR.
+Thank you for working on PD! Please read PD's [CONTRIBUTING](https://github.com/tikv/pd/blob/master/CONTRIBUTING.md) document **BEFORE** filing this PR.
 PR Title Format:
 1. pkg [, pkg2, pkg3]: what's changed
 2. *: what's changed
@@ -27,7 +27,7 @@ Tests
 Code changes
 
 - Has configuration change
-- Has HTTP API interfaces change (Don't forget to [add the declarative for API](https://github.com/pingcap/pd/blob/master/docs/development.md#updating-api-documentation))
+- Has HTTP API interfaces change (Don't forget to [add the declarative for API](https://github.com/tikv/pd/blob/master/docs/development.md#updating-api-documentation))
 - Has persistent data change
 
 Side effects
diff --git a/.github/workflows/assign-to-one-project.yaml b/.github/workflows/assign-to-one-project.yaml
index 4bc984bffa9..760aa442a83 100644
--- a/.github/workflows/assign-to-one-project.yaml
+++ b/.github/workflows/assign-to-one-project.yaml
@@ -18,7 +18,7 @@ jobs:
         contains(github.event.issue.labels.*.name, 'component/schedule') ||
         contains(github.event.issue.labels.*.name, 'component/scheduler')
       with:
-        project: 'https://github.com/pingcap/pd/projects/5'
+        project: 'https://github.com/tikv/pd/projects/5'
         column_name: 'Issue: Need Triage'
     - name: Run issues assignment to Questions and Bug Reports
       uses: srggrs/assign-one-project-github-action@1.2.0
@@ -26,5 +26,5 @@ jobs:
         contains(github.event.issue.labels.*.name, 'type/question') ||
         contains(github.event.issue.labels.*.name, 'type/bug')
       with:
-        project: 'https://github.com/pingcap/pd/projects/6'
+        project: 'https://github.com/tikv/pd/projects/6'
         column_name: 'Need Triage'
diff --git a/.travis.yml b/.travis.yml
index d3d821ef940..fdd6fc7281e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@ cache:
   directories:
     - $HOME/.cache/go-build
     - $GOPATH/pkg/mod
-    - $GOPATH/src/github.com/pingcap/pd/.tools
+    - $GOPATH/src/github.com/tikv/pd/.tools
     # Cache for old branches
-    - $GOPATH/src/github.com/pingcap/pd/.retools
+    - $GOPATH/src/github.com/tikv/pd/.retools
 
 go:
   - 1.13
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19b972171a7..912e710e5cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,34 +4,34 @@
 
 + Unify the log format for easy collection and analysis by tools
 + Simulator
-    - Support different heartbeat intervals in different stores [#1418](https://github.com/pingcap/pd/pull/1418)
-    - Add a case about importing data [#1263](https://github.com/pingcap/pd/pull/1263)
-+ Make hotspot scheduling configurable [#1412](https://github.com/pingcap/pd/pull/1412)
-+ Add the store address as the dimension monitoring item to replace the previous Store ID [#1429](https://github.com/pingcap/pd/pull/1429)
-+ Optimize the `GetStores` overhead to speed up the Region inspection cycle [#1410](https://github.com/pingcap/pd/pull/1410)
-+ Add an interface to delete the Tombstone Store [#1472](https://github.com/pingcap/pd/pull/1472)
+    - Support different heartbeat intervals in different stores [#1418](https://github.com/tikv/pd/pull/1418)
+    - Add a case about importing data [#1263](https://github.com/tikv/pd/pull/1263)
++ Make hotspot scheduling configurable [#1412](https://github.com/tikv/pd/pull/1412)
++ Add the store address as the dimension monitoring item to replace the previous Store ID [#1429](https://github.com/tikv/pd/pull/1429)
++ Optimize the `GetStores` overhead to speed up the Region inspection cycle [#1410](https://github.com/tikv/pd/pull/1410)
++ Add an interface to delete the Tombstone Store [#1472](https://github.com/tikv/pd/pull/1472)
 
 ## v3.0.0-beta
-- Add `RegionStorage` to store Region metadata separately [#1237](https://github.com/pingcap/pd/pull/1237)
-- Add shuffle hot Region scheduler [#1361](https://github.com/pingcap/pd/pull/1361)
-- Add scheduling parameter related metrics [#1406](https://github.com/pingcap/pd/pull/1406)
-- Add cluster label related metrics [#1402](https://github.com/pingcap/pd/pull/1402)
-- Add the importing data simulator [#1263](https://github.com/pingcap/pd/pull/1263)
-- Fix the `Watch` issue about leader election [#1396](https://github.com/pingcap/pd/pull/1396)
+- Add `RegionStorage` to store Region metadata separately [#1237](https://github.com/tikv/pd/pull/1237)
+- Add shuffle hot Region scheduler [#1361](https://github.com/tikv/pd/pull/1361)
+- Add scheduling parameter related metrics [#1406](https://github.com/tikv/pd/pull/1406)
+- Add cluster label related metrics [#1402](https://github.com/tikv/pd/pull/1402)
+- Add the importing data simulator [#1263](https://github.com/tikv/pd/pull/1263)
+- Fix the `Watch` issue about leader election [#1396](https://github.com/tikv/pd/pull/1396)
 
 ## v2.1.2
-- Fix the Region information update issue about Region merge [#1377](https://github.com/pingcap/pd/pull/1377)
+- Fix the Region information update issue about Region merge [#1377](https://github.com/tikv/pd/pull/1377)
 
 ## v2.1.1
-- Fix the issue that some configuration items cannot be set to `0` in the configuration file [#1334](https://github.com/pingcap/pd/pull/1334)
-- Check the undefined configuration when starting PD [#1362](https://github.com/pingcap/pd/pull/1362)
-- Avoid transferring the leader to a newly created peer, to optimize the possible delay [#1339](https://github.com/pingcap/pd/pull/1339)
-- Fix the issue that `RaftCluster` cannot stop caused by deadlock [#1370](https://github.com/pingcap/pd/pull/1370)
+- Fix the issue that some configuration items cannot be set to `0` in the configuration file [#1334](https://github.com/tikv/pd/pull/1334)
+- Check the undefined configuration when starting PD [#1362](https://github.com/tikv/pd/pull/1362)
+- Avoid transferring the leader to a newly created peer, to optimize the possible delay [#1339](https://github.com/tikv/pd/pull/1339)
+- Fix the issue that `RaftCluster` cannot stop caused by deadlock [#1370](https://github.com/tikv/pd/pull/1370)
 
 ## v2.1.0
 + Optimize availability
     - Introduce the version control mechanism and support rolling update of the cluster compatibly
-    - [Enable `Raft PreVote`](https://github.com/pingcap/pd/blob/5c7b18cf3af91098f07cf46df0b59fbf8c7c5462/conf/config.toml#L22) among PD nodes to avoid leader reelection when network recovers after network isolation
+    - [Enable `Raft PreVote`](https://github.com/tikv/pd/blob/5c7b18cf3af91098f07cf46df0b59fbf8c7c5462/conf/config.toml#L22) among PD nodes to avoid leader reelection when network recovers after network isolation
     - Enable `raft learner` by default to lower the risk of unavailable data caused by machine failure during scheduling
     - TSO allocation is no longer affected by the system clock going backwards
     - Support the `Region merge` feature to reduce the overhead brought by metadata
@@ -43,7 +43,7 @@
     - Optimize the issue that Balance Scheduler schedules small Regions frequently
     - Optimize Region merge to consider the number of rows within the Region
     - [Add more commands to control the scheduling policy](https://pingcap.com/docs/tools/pd-control/#config-show--set-option-value)
-    - Improve [PD simulator](https://github.com/pingcap/pd/tree/release-2.1/tools/pd-simulator) to simulate the scheduling scenarios
+    - Improve [PD simulator](https://github.com/tikv/pd/tree/release-2.1/tools/pd-simulator) to simulate the scheduling scenarios
 
 + API and operation tools
     - Add the [`GetPrevRegion` interface](https://github.com/pingcap/kvproto/blob/8e3f33ac49297d7c93b61a955531191084a2f685/proto/pdpb.proto#L40) to support the `TiDB reverse scan` feature
@@ -69,25 +69,25 @@
     - Optimize the performance of computing hotspot statistics
 
 ## v2.1.0-rc.5
-- Fix the issues related to `pd-ctl` reading the Region key [#1298](https://github.com/pingcap/pd/pull/1298) [#1299](https://github.com/pingcap/pd/pull/1299) [#1308](https://github.com/pingcap/pd/pull/1308)
-- Fix the issue that the `regions/check` API returns the wrong result [#1311](https://github.com/pingcap/pd/pull/1311)
-- Fix the issue that PD cannot restart join after a PD join failure [#1279](https://github.com/pingcap/pd/pull/1279)
-- Fix the issue that `watch leader` might lose events in some cases [#1317](https://github.com/pingcap/pd/pull/1317)
+- Fix the issues related to `pd-ctl` reading the Region key [#1298](https://github.com/tikv/pd/pull/1298) [#1299](https://github.com/tikv/pd/pull/1299) [#1308](https://github.com/tikv/pd/pull/1308)
+- Fix the issue that the `regions/check` API returns the wrong result [#1311](https://github.com/tikv/pd/pull/1311)
+- Fix the issue that PD cannot restart join after a PD join failure [#1279](https://github.com/tikv/pd/pull/1279)
+- Fix the issue that `watch leader` might lose events in some cases [#1317](https://github.com/tikv/pd/pull/1317)
 
 ## v2.1.0-rc.4
-- Fix the issue that the tombstone TiKV is not removed from Grafana [#1261](https://github.com/pingcap/pd/pull/1261)
-- Fix the data race issue when grpc-go configures the status [#1265](https://github.com/pingcap/pd/pull/1265)
-- Fix the issue that the PD server gets stuck caused by etcd startup failure [#1267](https://github.com/pingcap/pd/pull/1267)
-- Fix the issue that data race might occur during leader switching [#1273](https://github.com/pingcap/pd/pull/1273)
-- Fix the issue that extra warning logs might be output when TiKV becomes tombstone [#1280](https://github.com/pingcap/pd/pull/1273)
+- Fix the issue that the tombstone TiKV is not removed from Grafana [#1261](https://github.com/tikv/pd/pull/1261)
+- Fix the data race issue when grpc-go configures the status [#1265](https://github.com/tikv/pd/pull/1265)
+- Fix the issue that the PD server gets stuck caused by etcd startup failure [#1267](https://github.com/tikv/pd/pull/1267)
+- Fix the issue that data race might occur during leader switching [#1273](https://github.com/tikv/pd/pull/1273)
+- Fix the issue that extra warning logs might be output when TiKV becomes tombstone [#1280](https://github.com/tikv/pd/pull/1273)
 
 ## v2.1.0-rc.3
 ### New feature
-- Add the API to get the Region list by size in reverse order [#1254](https://github.com/pingcap/pd/pull/1254)
+- Add the API to get the Region list by size in reverse order [#1254](https://github.com/tikv/pd/pull/1254)
 ### Improvement
-- Return more detailed information in the Region API [#1252](https://github.com/pingcap/pd/pull/1252)
+- Return more detailed information in the Region API [#1252](https://github.com/tikv/pd/pull/1252)
 ### Bug fix
-- Fix the issue that `adjacent-region-scheduler` might lead to a crash after PD switches the leader [#1250](https://github.com/pingcap/pd/pull/1250)
+- Fix the issue that `adjacent-region-scheduler` might lead to a crash after PD switches the leader [#1250](https://github.com/tikv/pd/pull/1250)
 
 ## v2.1.0-rc2
 ### Features
diff --git a/Dockerfile b/Dockerfile
index 112be8aa2ff..358ccc8fdb9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,8 +14,8 @@ RUN cd / && \
     wget https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 -O jq && \
     chmod +x jq
 
-RUN mkdir -p /go/src/github.com/pingcap/pd
-WORKDIR /go/src/github.com/pingcap/pd
+RUN mkdir -p /go/src/github.com/tikv/pd
+WORKDIR /go/src/github.com/tikv/pd
 
 # Cache dependencies
 COPY go.mod .
@@ -29,9 +29,9 @@ RUN make
 
 FROM alpine:3.5
 
-COPY --from=builder /go/src/github.com/pingcap/pd/bin/pd-server /pd-server
-COPY --from=builder /go/src/github.com/pingcap/pd/bin/pd-ctl /pd-ctl
-COPY --from=builder /go/src/github.com/pingcap/pd/bin/pd-recover /pd-recover
+COPY --from=builder /go/src/github.com/tikv/pd/bin/pd-server /pd-server
+COPY --from=builder /go/src/github.com/tikv/pd/bin/pd-ctl /pd-ctl
+COPY --from=builder /go/src/github.com/tikv/pd/bin/pd-recover /pd-recover
 COPY --from=builder /jq /usr/local/bin/jq
 
 EXPOSE 2379 2380
diff --git a/Makefile b/Makefile
index a15dd8b0c82..7dcc73e52bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-PD_PKG := github.com/pingcap/pd/v4
+PD_PKG := github.com/tikv/pd
 
 TEST_PKGS := $(shell find . -iname "*_test.go" -exec dirname {} \; | \
-                     sort -u | sed -e "s/^\./github.com\/pingcap\/pd\/v4/")
+                     sort -u | sed -e "s/^\./github.com\/tikv\/pd/")
 INTEGRATION_TEST_PKGS := $(shell find . -iname "*_test.go" -exec dirname {} \; | \
-                     sort -u | sed -e "s/^\./github.com\/pingcap\/pd\/v4/" | grep -E "tests")
+                     sort -u | sed -e "s/^\./github.com\/tikv\/pd/" | grep -E "tests")
 BASIC_TEST_PKGS := $(filter-out $(INTEGRATION_TEST_PKGS),$(TEST_PKGS))
 
 PACKAGES := go list ./...
@@ -11,6 +11,7 @@ PACKAGE_DIRECTORIES := $(PACKAGES) | sed 's|$(PD_PKG)/||'
 GOCHECKER := awk '{ print } END { if (NR > 0) { exit 1 } }'
 OVERALLS := overalls
 
+BUILD_BIN_PATH := $(shell pwd)/bin
 GO_TOOLS_BIN_PATH := $(shell pwd)/.tools/bin
 PATH := $(GO_TOOLS_BIN_PATH):$(PATH)
 SHELL := env PATH='$(PATH)' GOBIN='$(GO_TOOLS_BIN_PATH)' /bin/bash
@@ -100,11 +101,11 @@ PD_SERVER_DEP += dashboard-ui
 
 pd-server: export GO111MODULE=on
 pd-server: ${PD_SERVER_DEP}
-	CGO_ENABLED=$(BUILD_CGO_ENABLED) go build $(BUILD_FLAGS) -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -tags "$(BUILD_TAGS)" -o bin/pd-server cmd/pd-server/main.go
+	CGO_ENABLED=$(BUILD_CGO_ENABLED) go build $(BUILD_FLAGS) -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -tags "$(BUILD_TAGS)" -o $(BUILD_BIN_PATH)/pd-server cmd/pd-server/main.go
 
 pd-server-basic: export GO111MODULE=on
 pd-server-basic:
-	SWAGGER=0 DASHBOARD=0 make pd-server
+	SWAGGER=0 DASHBOARD=0 $(MAKE) pd-server
 
 # dependent
 install-go-tools: export GO111MODULE=on
@@ -126,19 +127,19 @@ dashboard-ui:
 # Tools
 pd-ctl: export GO111MODULE=on
 pd-ctl:
-	CGO_ENABLED=0 go build -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -o bin/pd-ctl tools/pd-ctl/main.go
+	CGO_ENABLED=0 go build -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -o $(BUILD_BIN_PATH)/pd-ctl tools/pd-ctl/main.go
 pd-tso-bench: export GO111MODULE=on
 pd-tso-bench:
-	CGO_ENABLED=0 go build -o bin/pd-tso-bench tools/pd-tso-bench/main.go
+	CGO_ENABLED=0 go build -o $(BUILD_BIN_PATH)/pd-tso-bench tools/pd-tso-bench/main.go
 pd-recover: export GO111MODULE=on
 pd-recover:
-	CGO_ENABLED=0 go build -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -o bin/pd-recover tools/pd-recover/main.go
+	CGO_ENABLED=0 go build -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -o $(BUILD_BIN_PATH)/pd-recover tools/pd-recover/main.go
 pd-analysis: export GO111MODULE=on
 pd-analysis:
-	CGO_ENABLED=0 go build -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -o bin/pd-analysis tools/pd-analysis/main.go
+	CGO_ENABLED=0 go build -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -o $(BUILD_BIN_PATH)/pd-analysis tools/pd-analysis/main.go
 pd-heartbeat-bench: export GO111MODULE=on
 pd-heartbeat-bench:
-	CGO_ENABLED=0 go build -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -o bin/pd-heartbeat-bench tools/pd-heartbeat-bench/main.go
+	CGO_ENABLED=0 go build -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -o $(BUILD_BIN_PATH)/pd-heartbeat-bench tools/pd-heartbeat-bench/main.go
 
 test: install-go-tools
 	# testing...
@@ -160,7 +161,7 @@ check-all: static lint tidy
 
 check-plugin:
 	@echo "checking plugin"
-	cd ./plugin/scheduler_example && make evictLeaderPlugin.so && rm evictLeaderPlugin.so
+	cd ./plugin/scheduler_example && $(MAKE) evictLeaderPlugin.so && rm evictLeaderPlugin.so
 
 static: export GO111MODULE=on
 static:
@@ -181,7 +182,7 @@ travis_coverage: export GO111MODULE=on
 travis_coverage:
 ifeq ("$(TRAVIS_COVERAGE)", "1")
 	@$(FAILPOINT_ENABLE)
-	CGO_ENABLED=1 $(OVERALLS) -concurrency=8 -project=github.com/pingcap/pd -covermode=count -ignore='.git,vendor' -- -coverpkg=./... || { $(FAILPOINT_DISABLE); exit 1; }
+	CGO_ENABLED=1 $(OVERALLS) -concurrency=8 -project=github.com/tikv/pd -covermode=count -ignore='.git,vendor' -- -coverpkg=./... || { $(FAILPOINT_DISABLE); exit 1; }
 	@$(FAILPOINT_DISABLE)
 else
 	@echo "coverage only runs in travis."
@@ -189,33 +190,44 @@ endif
 
 simulator: export GO111MODULE=on
 simulator:
-	CGO_ENABLED=0 go build -o bin/pd-simulator tools/pd-simulator/main.go
+	CGO_ENABLED=0 go build -o $(BUILD_BIN_PATH)/pd-simulator tools/pd-simulator/main.go
 
 regions-dump: export GO111MODULE=on
 regions-dump:
-	CGO_ENABLED=0 go build -o bin/regions-dump tools/regions-dump/main.go
+	CGO_ENABLED=0 go build -o $(BUILD_BIN_PATH)/regions-dump tools/regions-dump/main.go
 
 stores-dump: export GO111MODULE=on
 stores-dump:
-	CGO_ENABLED=0 go build -o bin/stores-dump tools/stores-dump/main.go
+	CGO_ENABLED=0 go build -o $(BUILD_BIN_PATH)/stores-dump tools/stores-dump/main.go
 
 clean-test:
+	# Cleaning test tmp...
 	rm -rf /tmp/test_pd*
 	rm -rf /tmp/pd-tests*
 	rm -rf /tmp/test_etcd*
 
+clean-build:
+	# Cleaning building files...
+	rm -rf .dashboard_asset_cache/
+	rm -rf $(BUILD_BIN_PATH)
+	rm -rf $(GO_TOOLS_BIN_PATH)
+
 deadlock-enable: install-go-tools
+	# Enabling deadlock...
 	@$(DEADLOCK_ENABLE)
 
-deadlock-disable:
+deadlock-disable: install-go-tools
+	# Disabling deadlock...
 	@$(DEADLOCK_DISABLE)
 
 failpoint-enable: install-go-tools
 	# Converting failpoints...
 	@$(FAILPOINT_ENABLE)
 
-failpoint-disable:
+failpoint-disable: install-go-tools
 	# Restoring failpoints...
 	@$(FAILPOINT_DISABLE)
 
-.PHONY: all ci vendor clean-test tidy
+clean: failpoint-disable deadlock-disable clean-test clean-build
+
+.PHONY: all ci vendor tidy clean-test clean-build clean
diff --git a/README.md b/README.md
index ffca0cfadf6..391e6c9b919 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # PD
 
-[![TravisCI Build Status](https://travis-ci.org/pingcap/pd.svg?branch=master)](https://travis-ci.org/pingcap/pd)
-![GitHub release](https://img.shields.io/github/release/pingcap/pd.svg)
-[![Go Report Card](https://goreportcard.com/badge/github.com/pingcap/pd)](https://goreportcard.com/report/github.com/pingcap/pd)
-[![codecov](https://codecov.io/gh/pingcap/pd/branch/master/graph/badge.svg)](https://codecov.io/gh/pingcap/pd)
+[![TravisCI Build Status](https://travis-ci.org/tikv/pd.svg?branch=master)](https://travis-ci.org/tikv/pd)
+![GitHub release](https://img.shields.io/github/release/tikv/pd.svg)
+[![Go Report Card](https://goreportcard.com/badge/github.com/tikv/pd)](https://goreportcard.com/report/github.com/tikv/pd)
+[![codecov](https://codecov.io/gh/tikv/pd/branch/master/graph/badge.svg)](https://codecov.io/gh/tikv/pd)
 
 PD is the abbreviation for Placement Driver. It is used to manage and schedule the [TiKV](https://github.com/tikv/tikv) cluster.
 
@@ -93,13 +93,13 @@ Date: Thu, 20 Feb 2020 09:49:42 GMT
 You can use the following command to build a PD image directly:
 
 ```bash
-docker build -t pingcap/pd .
+docker build -t tikv/pd .
 ```
 
 Or you can also use following command to get PD from Docker hub:
 
 ```bash
-docker pull pingcap/pd
+docker pull tikv/pd
 ```
 
 Run a single node with Docker:
@@ -108,7 +108,7 @@ Run a single node with Docker:
 # Set correct HostIP here.
 export HostIP="192.168.199.105"
 
-docker run -d -p 2379:2379 -p 2380:2380 --name pd pingcap/pd \
+docker run -d -p 2379:2379 -p 2380:2380 --name pd tikv/pd \
           --name="pd" \
           --data-dir="pd" \
           --client-urls="http://0.0.0.0:2379" \
diff --git a/build.ps1 b/build.ps1
index 3c2e8a2e26c..aec0fa52ad3 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,5 +1,5 @@
 # For `--version`
-$PD_PKG = "github.com/pingcap/pd"
+$PD_PKG = "github.com/tikv/pd"
 $GO_LDFLAGS = "-X `"$PD_PKG/server.PDReleaseVersion=$(git describe --tags --dirty)`""
 $GO_LDFLAGS += " -X `"$PD_PKG/server.PDBuildTS=$(date -u '+%Y-%m-%d_%I:%M:%S')`""
 $GO_LDFLAGS += " -X `"$PD_PKG/server.PDGitHash=$(git rev-parse HEAD)`""
diff --git a/client/base_client.go b/client/base_client.go
index 5e38370cbb8..40a7e7760ae 100644
--- a/client/base_client.go
+++ b/client/base_client.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,10 +20,11 @@ import (
 	"sync"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/grpcutil"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/grpcutil"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 )
@@ -137,7 +138,7 @@ func (c *baseClient) leaderLoop() {
 		}
 
 		if err := c.updateLeader(); err != nil {
-			log.Error("[pd] failed updateLeader", zap.Error(err))
+			log.Error("[pd] failed updateLeader", errs.ZapError(errs.ErrUpdateLeader, err))
 		}
 	}
 }
@@ -177,7 +178,7 @@ func (c *baseClient) initClusterID() error {
 		members, err := c.getMembers(timeoutCtx, u)
 		timeoutCancel()
 		if err != nil || members.GetHeader() == nil {
-			log.Warn("[pd] failed to get cluster id", zap.String("url", u), zap.Error(err))
+			log.Warn("[pd] failed to get cluster id", zap.String("url", u), errs.ZapError(errs.ErrGetClusterID, err))
 			continue
 		}
 		c.clusterID = members.GetHeader().GetClusterId()
@@ -191,7 +192,7 @@ func (c *baseClient) updateLeader() error {
 		ctx, cancel := context.WithTimeout(c.ctx, updateLeaderTimeout)
 		members, err := c.getMembers(ctx, u)
 		if err != nil {
-			log.Warn("[pd] cannot update leader", zap.String("address", u), zap.Error(err))
+			log.Warn("[pd] cannot update leader", zap.String("address", u), errs.ZapError(errs.ErrUpdateLeader, err))
 		}
 		cancel()
 		if err != nil || members.GetLeader() == nil || len(members.GetLeader().GetClientUrls()) == 0 {
diff --git a/client/client.go b/client/client.go
index 4ace7e119df..7b0bd2e99be 100644
--- a/client/client.go
+++ b/client/client.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,10 +20,11 @@ import (
 	"time"
 
 	"github.com/opentracing/opentracing-go"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/errs"
 	"go.uber.org/zap"
 )
 
@@ -179,7 +180,7 @@ func (c *client) tsCancelLoop() {
 		case d := <-c.tsDeadlineCh:
 			select {
 			case <-d.timer:
-				log.Error("tso request is canceled due to timeout")
+				log.Error("tso request is canceled due to timeout", zap.Error(errs.ErrGetTSO.FastGenByArgs()))
 				d.cancel()
 			case <-d.done:
 			case <-ctx.Done():
@@ -234,7 +235,7 @@ func (c *client) tsLoop() {
 					return
 				default:
 				}
-				log.Error("[pd] create tso stream error", zap.Error(err))
+				log.Error("[pd] create tso stream error", errs.ZapError(errs.ErrCreateTSOStream, err))
 				c.ScheduleCheckLeader()
 				cancel()
 				c.revokeTSORequest(errors.WithStack(err))
@@ -281,7 +282,7 @@ func (c *client) tsLoop() {
 				return
 			default:
 			}
-			log.Error("[pd] getTS error", zap.Error(err))
+			log.Error("[pd] getTS error", errs.ZapError(errs.ErrGetTSO, err))
 			c.ScheduleCheckLeader()
 			cancel()
 			stream, cancel = nil, nil
@@ -378,7 +379,7 @@ func (c *client) Close() {
 	defer c.connMu.Unlock()
 	for _, cc := range c.connMu.clientConns {
 		if err := cc.Close(); err != nil {
-			log.Error("[pd] failed close grpc clientConn", zap.Error(err))
+			log.Error("[pd] failed to close gRPC clientConn", errs.ZapError(errs.ErrCloseGRPCConn, err))
 		}
 	}
 }
diff --git a/client/client_test.go b/client/client_test.go
index 008c9329844..57b3bebb820 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/testutil"
+	"github.com/tikv/pd/pkg/testutil"
 	"go.uber.org/goleak"
 	"google.golang.org/grpc"
 )
diff --git a/client/metrics.go b/client/metrics.go
index 508c9906609..fef8b27c75d 100644
--- a/client/metrics.go
+++ b/client/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/cmd/pd-server/main.go b/cmd/pd-server/main.go
index 96b00bc87d8..1eae1afb3e3 100644
--- a/cmd/pd-server/main.go
+++ b/cmd/pd-server/main.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,21 +21,21 @@ import (
 	"syscall"
 
 	grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/autoscaling"
-	"github.com/pingcap/pd/v4/pkg/dashboard"
-	"github.com/pingcap/pd/v4/pkg/logutil"
-	"github.com/pingcap/pd/v4/pkg/metricutil"
-	"github.com/pingcap/pd/v4/pkg/swaggerserver"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/api"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/join"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/autoscaling"
+	"github.com/tikv/pd/pkg/dashboard"
+	"github.com/tikv/pd/pkg/logutil"
+	"github.com/tikv/pd/pkg/metricutil"
+	"github.com/tikv/pd/pkg/swaggerserver"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/api"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/join"
 	"go.uber.org/zap"
 
 	// Register schedulers.
-	_ "github.com/pingcap/pd/v4/server/schedulers"
+	_ "github.com/tikv/pd/server/schedulers"
 )
 
 func main() {
diff --git a/docs/development-workflow.md b/docs/development-workflow.md
index 4a95d72f535..59e85afdba8 100644
--- a/docs/development-workflow.md
+++ b/docs/development-workflow.md
@@ -6,7 +6,7 @@ Start by forking the `pd` GitHub repository, make changes in a branch and then s
 ## Set up your pd GitHub Repository
 
 
-After forking the [PD upstream](https://github.com/pingcap/pd/fork) source repository to your personal repository. You can set up your personal development environment for PD project.
+After forking the [PD upstream](https://github.com/tikv/pd/fork) source repository to your personal repository. You can set up your personal development environment for PD project.
 
 ```sh
 $ cd $GOPATH/src/github.com/pingcap
@@ -18,7 +18,7 @@ $ cd pd
 
 
 ```sh
-$ git remote add upstream https://github.com/pingcap/pd
+$ git remote add upstream https://github.com/tikv/pd
 $ git fetch upstream
 $ git merge upstream/master
 ...
diff --git a/docs/development.md b/docs/development.md
index d71ba7ce679..2bd02b95340 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -26,7 +26,7 @@ The full test suite is ran with:
 
 This takes a while to run. The test suite uses a fork of [gocheck](http://labix.org/gocheck). With gocheck, individual tests can be ran with this form:
 
-    go test github.com/pingcap/pd/server/api -check.f TestJsonRespondError
+    go test github.com/tikv/pd/server/api -check.f TestJsonRespondError
 
 # Changing APIs
 
diff --git a/go.mod b/go.mod
index fa9463202ae..42df1da8e02 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/pingcap/pd/v4
+module github.com/tikv/pd
 
 go 1.13
 
@@ -25,16 +25,16 @@ require (
 	github.com/opentracing/opentracing-go v1.0.2
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/phf/go-queue v0.0.0-20170504031614-9abe38d0371d
-	github.com/pingcap-incubator/tidb-dashboard v0.0.0-20200715070228-47f5de8a6992
+	github.com/pingcap-incubator/tidb-dashboard v0.0.0-20200807020752-01f0abe88e93
 	github.com/pingcap/check v0.0.0-20191216031241-8a5a85928f12
 	github.com/pingcap/errcode v0.0.0-20180921232412-a1a7271709d9
-	github.com/pingcap/errors v0.11.5-0.20200729012136-4e113ddee29e
+	github.com/pingcap/errors v0.11.5-0.20200820035142-66eb5bf1d1cd
 	github.com/pingcap/failpoint v0.0.0-20191029060244-12f4ac2fd11d
-	github.com/pingcap/kvproto v0.0.0-20200715040832-c3e2e0b163ee
+	github.com/pingcap/kvproto v0.0.0-20200810113304-6157337686b1
 	github.com/pingcap/log v0.0.0-20200511115504-543df19646ad
 	github.com/pingcap/sysutil v0.0.0-20200715082929-4c47bcac246a
-	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.0.0
+	github.com/prometheus/common v0.4.1
 	github.com/sasha-s/go-deadlock v0.2.0
 	github.com/sirupsen/logrus v1.2.0
 	github.com/spf13/cobra v0.0.3
diff --git a/go.sum b/go.sum
index 0f2c2423cb3..aff20f6e712 100644
--- a/go.sum
+++ b/go.sum
@@ -274,8 +274,8 @@ github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
 github.com/phf/go-queue v0.0.0-20170504031614-9abe38d0371d h1:U+PMnTlV2tu7RuMK5etusZG3Cf+rpow5hqQByeCzJ2g=
 github.com/phf/go-queue v0.0.0-20170504031614-9abe38d0371d/go.mod h1:lXfE4PvvTW5xOjO6Mba8zDPyw8M93B6AQ7frTGnMlA8=
-github.com/pingcap-incubator/tidb-dashboard v0.0.0-20200715070228-47f5de8a6992 h1:Zp+8RrZHu6HQabWA9smENTRS7AQS79cb5K0Cuduqn6Q=
-github.com/pingcap-incubator/tidb-dashboard v0.0.0-20200715070228-47f5de8a6992/go.mod h1:9yaAM77sPfa5/f6sdxr3jSkKfIz463KRHyiFHiGjdes=
+github.com/pingcap-incubator/tidb-dashboard v0.0.0-20200807020752-01f0abe88e93 h1:lIUMU2/5982LHUvDkcqitVRonFJERj8NOlaT6iBg8e0=
+github.com/pingcap-incubator/tidb-dashboard v0.0.0-20200807020752-01f0abe88e93/go.mod h1:9yaAM77sPfa5/f6sdxr3jSkKfIz463KRHyiFHiGjdes=
 github.com/pingcap/check v0.0.0-20190102082844-67f458068fc8 h1:USx2/E1bX46VG32FIw034Au6seQ2fY9NEILmNh/UlQg=
 github.com/pingcap/check v0.0.0-20190102082844-67f458068fc8/go.mod h1:B1+S9LNcuMyLH/4HMTViQOJevkGiik3wW2AN9zb2fNQ=
 github.com/pingcap/check v0.0.0-20191107115940-caf2b9e6ccf4 h1:iRtOAQ6FXkY/BGvst3CDfTva4nTqh6CL8WXvanLdbu0=
@@ -286,14 +286,14 @@ github.com/pingcap/errcode v0.0.0-20180921232412-a1a7271709d9 h1:KH4f4Si9XK6/IW5
 github.com/pingcap/errcode v0.0.0-20180921232412-a1a7271709d9/go.mod h1:4b2X8xSqxIroj/IZ9MX/VGZhAwc11wB9wRIzHvz6SeM=
 github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
 github.com/pingcap/errors v0.11.5-0.20190809092503-95897b64e011/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
-github.com/pingcap/errors v0.11.5-0.20200729012136-4e113ddee29e h1:/EGWHNOyEgizEBuAujWsb9vXrPZtt1b7ooDPyjEkjDw=
-github.com/pingcap/errors v0.11.5-0.20200729012136-4e113ddee29e/go.mod h1:g4vx//d6VakjJ0mk7iLBlKA8LFavV/sAVINT/1PFxeQ=
+github.com/pingcap/errors v0.11.5-0.20200820035142-66eb5bf1d1cd h1:ay+wAVWHI/Z6vIik13hsK+FT9ZCNSPBElGr0qgiZpjg=
+github.com/pingcap/errors v0.11.5-0.20200820035142-66eb5bf1d1cd/go.mod h1:g4vx//d6VakjJ0mk7iLBlKA8LFavV/sAVINT/1PFxeQ=
 github.com/pingcap/failpoint v0.0.0-20191029060244-12f4ac2fd11d h1:F8vp38kTAckN+v8Jlc98uMBvKIzr1a+UhnLyVYn8Q5Q=
 github.com/pingcap/failpoint v0.0.0-20191029060244-12f4ac2fd11d/go.mod h1:DNS3Qg7bEDhU6EXNHF+XSv/PGznQaMJ5FWvctpm6pQI=
 github.com/pingcap/kvproto v0.0.0-20191211054548-3c6b38ea5107/go.mod h1:WWLmULLO7l8IOcQG+t+ItJ3fEcrL5FxF0Wu+HrMy26w=
 github.com/pingcap/kvproto v0.0.0-20200411081810-b85805c9476c/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI=
-github.com/pingcap/kvproto v0.0.0-20200715040832-c3e2e0b163ee h1:DVIvoPsg68XMQje9ivq7l8Iz8sTCBZGrHeaSwg+mwjw=
-github.com/pingcap/kvproto v0.0.0-20200715040832-c3e2e0b163ee/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI=
+github.com/pingcap/kvproto v0.0.0-20200810113304-6157337686b1 h1:hv22UEhdqeIqa5Jx0oeqDQNGHUBSW3LVOx02gqbd5Gg=
+github.com/pingcap/kvproto v0.0.0-20200810113304-6157337686b1/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI=
 github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9 h1:AJD9pZYm72vMgPcQDww9rkZ1DnWfl0pXV3BOWlkYIjA=
 github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8=
 github.com/pingcap/log v0.0.0-20200117041106-d28c14d3b1cd h1:CV3VsP3Z02MVtdpTMfEgRJ4T9NGgGTxdHpJerent7rM=
diff --git a/metrics/alertmanager/pd.rules.yml b/metrics/alertmanager/pd.rules.yml
index 2dd76999620..09e65fed90f 100644
--- a/metrics/alertmanager/pd.rules.yml
+++ b/metrics/alertmanager/pd.rules.yml
@@ -168,3 +168,15 @@ groups:
       description: 'cluster: ENV_LABELS_ENV, type: {{ $labels.type }}, instance: {{ $labels.instance }}, values: {{ $value }}'
       value: '{{ $value }}'
       summary: PD_no_store_for_making_replica
+
+  - alert: PD_node_restart
+    expr: changes(process_start_time_seconds{job="pd"}[5m]) > 0
+    for: 1m
+    labels:
+      env: ENV_LABELS_ENV
+      level: warning
+      expr:  changes(process_start_time_seconds{job="pd"}[5m]) > 0
+    annotations:
+      description: 'cluster: ENV_LABELS_ENV, instance: {{ $labels.instance }}, values:{{ $value }}'
+      value: '{{ $value }}'
+      summary: PD server has been restarted
diff --git a/pkg/apiutil/apiutil.go b/pkg/apiutil/apiutil.go
index 266dc9add2c..abf90095bcc 100644
--- a/pkg/apiutil/apiutil.go
+++ b/pkg/apiutil/apiutil.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ import (
 	"strconv"
 
 	"github.com/pingcap/errcode"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pkg/errors"
 	"github.com/unrolled/render"
 )
 
diff --git a/pkg/apiutil/serverapi/middleware.go b/pkg/apiutil/serverapi/middleware.go
index cbe06ab341e..64dcf5cfa8d 100644
--- a/pkg/apiutil/serverapi/middleware.go
+++ b/pkg/apiutil/serverapi/middleware.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,8 +20,9 @@ import (
 	"strings"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
+	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
 	"github.com/urfave/negroni"
 	"go.uber.org/zap"
 )
@@ -145,21 +146,21 @@ func (p *customReverseProxies) ServeHTTP(w http.ResponseWriter, r *http.Request)
 
 		resp, err := p.client.Do(r)
 		if err != nil {
-			log.Error("request failed", zap.Error(err))
+			log.Error("request failed", errs.ZapError(errs.ErrRequestHTTP, err))
 			continue
 		}
 
 		b, err := ioutil.ReadAll(resp.Body)
 		resp.Body.Close()
 		if err != nil {
-			log.Error("request failed", zap.Error(err))
+			log.Error("read failed", errs.ZapError(errs.ErrReadHTTPBody, err))
 			continue
 		}
 
 		copyHeader(w.Header(), resp.Header)
 		w.WriteHeader(resp.StatusCode)
 		if _, err := w.Write(b); err != nil {
-			log.Error("write failed", zap.Error(err))
+			log.Error("write failed", errs.ZapError(errs.ErrWriteHTTPBody, err))
 			continue
 		}
 
diff --git a/pkg/autoscaling/calculation.go b/pkg/autoscaling/calculation.go
new file mode 100644
index 00000000000..5f912e7eb9e
--- /dev/null
+++ b/pkg/autoscaling/calculation.go
@@ -0,0 +1,351 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package autoscaling
+
+import (
+	"math"
+	"strings"
+	"time"
+
+	"github.com/pingcap/kvproto/pkg/metapb"
+	"github.com/pingcap/log"
+	promClient "github.com/prometheus/client_golang/api"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/cluster"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/core"
+	"go.uber.org/zap"
+)
+
+const (
+	groupLabelKey                  = "group"
+	autoScalingGroupLabelKeyPrefix = "pd-auto-scaling-"
+	millicores                     = 1000
+)
+
+// TODO: adjust the value or make it configurable.
+var (
+	// MetricsTimeDuration is used to get the metrics of a certain time period.
+	MetricsTimeDuration = 5 * time.Second
+	// MaxScaleOutStep is used to indicate the maxium number of instance for scaling out operations at once.
+	MaxScaleOutStep uint64 = 1
+	// MaxScaleInStep is used to indicate the maxium number of instance for scaling in operations at once.
+	MaxScaleInStep uint64 = 1
+)
+
+func calculate(rc *cluster.RaftCluster, cfg *config.PDServerConfig, strategy *Strategy) []*Plan {
+	var plans []*Plan
+
+	client, err := promClient.NewClient(promClient.Config{
+		Address: cfg.MetricStorage,
+	})
+	if err != nil {
+		log.Error("error initializing Prometheus client", zap.String("metric-storage", cfg.MetricStorage), zap.Error(err))
+		return nil
+	}
+	querier := NewPrometheusQuerier(client)
+
+	if tikvPlans := getPlans(rc, querier, strategy, TiKV); tikvPlans != nil {
+		plans = append(plans, tikvPlans...)
+	}
+	if tidbPlans := getPlans(rc, querier, strategy, TiDB); tidbPlans != nil {
+		plans = append(plans, tidbPlans...)
+	}
+	return plans
+}
+
+func getPlans(rc *cluster.RaftCluster, querier Querier, strategy *Strategy, component ComponentType) []*Plan {
+	var instances []instance
+	if component == TiKV {
+		instances = filterTiKVInstances(rc)
+	} else {
+		instances = getTiDBInstances()
+	}
+
+	if len(instances) == 0 {
+		return nil
+	}
+
+	now := time.Now()
+	totalCPUUseTime, err := getTotalCPUUseTime(querier, component, instances, now, MetricsTimeDuration)
+	if err != nil {
+		log.Error("cannot get total CPU used time", zap.Error(err))
+		return nil
+	}
+
+	currentQuota, err := getTotalCPUQuota(querier, component, instances, now)
+	if err != nil {
+		log.Error("cannot get total CPU quota", zap.Error(err))
+		return nil
+	}
+
+	totalCPUTime := float64(currentQuota) / millicores * MetricsTimeDuration.Seconds()
+	usage := totalCPUUseTime / totalCPUTime
+	maxThreshold, minThreshold := getCPUThresholdByComponent(strategy, component)
+
+	// TODO: add metrics to show why it triggers scale in/out.
+	if usage > maxThreshold {
+		scaleOutQuota := (totalCPUUseTime - totalCPUTime*maxThreshold) / MetricsTimeDuration.Seconds()
+		return calculateScaleOutPlan(rc, strategy, component, scaleOutQuota, currentQuota, instances)
+	}
+	if usage < minThreshold {
+		scaleInQuota := (totalCPUTime*minThreshold - totalCPUUseTime) / MetricsTimeDuration.Seconds()
+		return calculateScaleInPlan(rc, strategy, component, scaleInQuota, instances)
+	}
+	return nil
+}
+
+func filterTiKVInstances(informer core.StoreSetInformer) []instance {
+	var instances []instance
+	stores := informer.GetStores()
+	for _, store := range stores {
+		if store.GetState() == metapb.StoreState_Up {
+			instances = append(instances, instance{id: store.GetID(), address: store.GetAddress()})
+		}
+	}
+	return instances
+}
+
+// TODO: get TiDB instances
+func getTiDBInstances() []instance {
+	return []instance{}
+}
+
+func getAddresses(instances []instance) []string {
+	names := make([]string, 0, len(instances))
+	for _, inst := range instances {
+		names = append(names, inst.address)
+	}
+	return names
+}
+
+// TODO: suppport other metrics storage
+// get total CPU use time (in seconds) through Prometheus.
+func getTotalCPUUseTime(querier Querier, component ComponentType, instances []instance, timestamp time.Time, duration time.Duration) (float64, error) {
+	result, err := querier.Query(NewQueryOptions(component, CPUUsage, getAddresses(instances), timestamp, duration))
+	if err != nil {
+		return 0.0, err
+	}
+
+	sum := 0.0
+	for _, value := range result {
+		sum += value
+	}
+
+	return sum, nil
+}
+
+// TODO: suppport other metrics storage
+// get total CPU quota (in millicores) through Prometheus.
+func getTotalCPUQuota(querier Querier, component ComponentType, instances []instance, timestamp time.Time) (uint64, error) {
+	result, err := querier.Query(NewQueryOptions(component, CPUQuota, getAddresses(instances), timestamp, 0))
+	if err != nil {
+		return 0, err
+	}
+
+	sum := 0.0
+	for _, value := range result {
+		sum += value
+	}
+
+	quota := uint64(math.Floor(sum * float64(millicores)))
+
+	return quota, nil
+}
+
+func getCPUThresholdByComponent(strategy *Strategy, component ComponentType) (maxThreshold float64, minThreshold float64) {
+	for _, rule := range strategy.Rules {
+		if rule.Component == component.String() {
+			return rule.CPURule.MaxThreshold, rule.CPURule.MinThreshold
+		}
+	}
+	return 0, 0
+}
+
+func getResourcesByComponent(strategy *Strategy, component ComponentType) []*Resource {
+	var resTyp []string
+	var resources []*Resource
+	for _, rule := range strategy.Rules {
+		if rule.Component == component.String() {
+			resTyp = rule.CPURule.ResourceTypes
+		}
+	}
+	for _, res := range strategy.Resources {
+		for _, typ := range resTyp {
+			if res.ResourceType == typ {
+				resources = append(resources, res)
+			}
+		}
+	}
+	return resources
+}
+
+func calculateScaleOutPlan(rc *cluster.RaftCluster, strategy *Strategy, component ComponentType, scaleOutQuota float64, currentQuota uint64, instances []instance) []*Plan {
+	groups := getScaledGroupsByComponent(rc, component, instances)
+	group := findBestGroupToScaleOut(rc, strategy, scaleOutQuota, groups, component)
+
+	resCPU := float64(getCPUByResourceType(strategy, group.ResourceType))
+	resCount := getCountByResourceType(strategy, group.ResourceType)
+	scaleOutCount := typeutil.MinUint64(uint64(math.Ceil(scaleOutQuota/resCPU)), MaxScaleOutStep)
+
+	// A new group created
+	if len(groups) == 0 {
+		if group.Count+scaleOutCount <= resCount {
+			group.Count += scaleOutCount
+			return []*Plan{&group}
+		}
+		return nil
+	}
+
+	// update the existed group
+	for i, g := range groups {
+		if g.ResourceType == group.ResourceType && group.Count+scaleOutCount <= resCount {
+			group.Count += scaleOutCount
+			groups[i] = &group
+		}
+	}
+	return groups
+}
+
+func calculateScaleInPlan(rc *cluster.RaftCluster, strategy *Strategy, component ComponentType, scaleInQuota float64, instances []instance) []*Plan {
+	groups := getScaledGroupsByComponent(rc, component, instances)
+	if len(groups) == 0 {
+		return nil
+	}
+	group := findBestGroupToScaleIn(rc, strategy, scaleInQuota, groups)
+	resCPU := float64(getCPUByResourceType(strategy, group.ResourceType))
+	scaleInCount := typeutil.MinUint64(uint64(math.Ceil(scaleInQuota/resCPU)), MaxScaleInStep)
+	for i, g := range groups {
+		if g.ResourceType == group.ResourceType {
+			if group.Count > scaleInCount {
+				group.Count -= scaleInCount
+				groups[i] = &group
+			} else {
+				groups = append(groups[:i], groups[i+1:]...)
+			}
+		}
+	}
+	return groups
+}
+
+func getCPUByResourceType(strategy *Strategy, resourceType string) uint64 {
+	for _, res := range strategy.Resources {
+		if res.ResourceType == resourceType {
+			return res.CPU
+		}
+	}
+	return 0
+}
+
+func getCountByResourceType(strategy *Strategy, resourceType string) uint64 {
+	for _, res := range strategy.Resources {
+		if res.ResourceType == resourceType {
+			return res.Count
+		}
+	}
+	return 0
+}
+
+// TODO: get the scaled groups
+func getScaledGroupsByComponent(rc *cluster.RaftCluster, component ComponentType, healthyInstances []instance) []*Plan {
+	switch component {
+	case TiKV:
+		return getScaledTiKVGroups(rc, healthyInstances)
+	case TiDB:
+		// TODO: support search TiDB Group
+		return []*Plan{}
+	default:
+		return nil
+	}
+}
+
+func getScaledTiKVGroups(informer core.StoreSetInformer, healthyInstances []instance) []*Plan {
+	planMap := make(map[string]map[string]struct{}, len(healthyInstances))
+	for _, instance := range healthyInstances {
+		store := informer.GetStore(instance.id)
+		if store == nil {
+			log.Warn("inconsistency between health instances and store status, exit auto-scaling calculation",
+				zap.Uint64("store-id", instance.id))
+			return nil
+		}
+		v := store.GetLabelValue(groupLabelKey)
+		buildPlanMap(planMap, v, instance.address)
+	}
+	return buildPlans(planMap, TiKV)
+}
+
+func getScaledTiDBGroups(informer tidbInformer, healthyInstances []instance) []*Plan {
+	planMap := make(map[string]map[string]struct{}, len(healthyInstances))
+	for _, instance := range healthyInstances {
+		tidb := informer.GetTiDB(instance.address)
+		if tidb == nil {
+			log.Warn("inconsistency between health instances and tidb status, exit auto-scaling calculation",
+				zap.String("tidb-address", instance.address))
+			return nil
+		}
+		v := tidb.getLabelValue(groupLabelKey)
+		buildPlanMap(planMap, v, instance.address)
+	}
+	return buildPlans(planMap, TiDB)
+}
+
+func buildPlanMap(planMap map[string]map[string]struct{}, groupName, address string) {
+	if len(groupName) > len(autoScalingGroupLabelKeyPrefix) &&
+		strings.HasPrefix(groupName, autoScalingGroupLabelKeyPrefix) {
+		if component, ok := planMap[groupName]; ok {
+			component[address] = struct{}{}
+		} else {
+			planMap[groupName] = map[string]struct{}{
+				address: {},
+			}
+		}
+	}
+}
+
+func buildPlans(planMap map[string]map[string]struct{}, componentType ComponentType) []*Plan {
+	var plans []*Plan
+	for groupLabel, groupInstances := range planMap {
+		plans = append(plans, &Plan{
+			Component: componentType.String(),
+			Count:     uint64(len(groupInstances)),
+			Labels: []*metapb.StoreLabel{
+				{
+					Key:   groupLabelKey,
+					Value: groupLabel,
+				},
+			},
+		})
+	}
+	return plans
+}
+
+// TODO: implement heterogeneous logic
+func findBestGroupToScaleIn(rc *cluster.RaftCluster, strategy *Strategy, scaleInQuota float64, groups []*Plan) Plan {
+	return *groups[0]
+}
+
+// TODO: implement heterogeneous logic
+func findBestGroupToScaleOut(rc *cluster.RaftCluster, strategy *Strategy, scaleOutQuota float64, groups []*Plan, component ComponentType) Plan {
+	if len(groups) != 0 {
+		return *groups[0]
+	}
+
+	resources := getResourcesByComponent(strategy, component)
+	group := Plan{
+		Component:    component.String(),
+		Count:        0,
+		ResourceType: resources[0].ResourceType,
+	}
+	return group
+}
diff --git a/pkg/autoscaling/calculation_test.go b/pkg/autoscaling/calculation_test.go
new file mode 100644
index 00000000000..66abfb2504f
--- /dev/null
+++ b/pkg/autoscaling/calculation_test.go
@@ -0,0 +1,367 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package autoscaling
+
+import (
+	"fmt"
+	"math"
+	"testing"
+	"time"
+
+	. "github.com/pingcap/check"
+	"github.com/pingcap/kvproto/pkg/metapb"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/server/core"
+)
+
+func Test(t *testing.T) {
+	TestingT(t)
+}
+
+var _ = Suite(&calculationTestSuite{})
+
+type calculationTestSuite struct{}
+
+func (s *calculationTestSuite) TestGetScaledTiKVGroups(c *C) {
+	// case1 indicates the tikv cluster with not any group existed
+	case1 := mockcluster.NewCluster(mockoption.NewScheduleOptions())
+	case1.AddLabelsStore(1, 1, map[string]string{})
+	case1.AddLabelsStore(2, 1, map[string]string{
+		"foo": "bar",
+	})
+	case1.AddLabelsStore(3, 1, map[string]string{
+		"id": "3",
+	})
+
+	// case2 indicates the tikv cluster with 1 auto-scaling group existed
+	case2 := mockcluster.NewCluster(mockoption.NewScheduleOptions())
+	case2.AddLabelsStore(1, 1, map[string]string{})
+	case2.AddLabelsStore(2, 1, map[string]string{
+		groupLabelKey: fmt.Sprintf("%s-0", autoScalingGroupLabelKeyPrefix),
+	})
+	case2.AddLabelsStore(3, 1, map[string]string{
+		groupLabelKey: fmt.Sprintf("%s-0", autoScalingGroupLabelKeyPrefix),
+	})
+
+	// case3 indicates the tikv cluster with other group existed
+	case3 := mockcluster.NewCluster(mockoption.NewScheduleOptions())
+	case3.AddLabelsStore(1, 1, map[string]string{})
+	case3.AddLabelsStore(2, 1, map[string]string{
+		groupLabelKey: "foo",
+	})
+	case3.AddLabelsStore(3, 1, map[string]string{
+		groupLabelKey: "foo",
+	})
+
+	testcases := []struct {
+		name             string
+		informer         core.StoreSetInformer
+		healthyInstances []instance
+		expectedPlan     []*Plan
+	}{
+		{
+			name:     "no scaled tikv group",
+			informer: case1,
+			healthyInstances: []instance{
+				{
+					id:      1,
+					address: "1",
+				},
+				{
+					id:      2,
+					address: "2",
+				},
+				{
+					id:      3,
+					address: "3",
+				},
+			},
+			expectedPlan: nil,
+		},
+		{
+			name:     "exist 1 scaled tikv group",
+			informer: case2,
+			healthyInstances: []instance{
+				{
+					id:      1,
+					address: "1",
+				},
+				{
+					id:      2,
+					address: "2",
+				},
+				{
+					id:      3,
+					address: "3",
+				},
+			},
+			expectedPlan: []*Plan{
+				{
+					Component: TiKV.String(),
+					Count:     2,
+					Labels: []*metapb.StoreLabel{
+						{
+							Key:   groupLabelKey,
+							Value: fmt.Sprintf("%s-0", autoScalingGroupLabelKeyPrefix),
+						},
+					},
+				},
+			},
+		},
+		{
+			name:     "exist 1 tikv scaled group with inconsistency healthy instances",
+			informer: case2,
+			healthyInstances: []instance{
+				{
+					id:      1,
+					address: "1",
+				},
+				{
+					id:      2,
+					address: "2",
+				},
+				{
+					id:      4,
+					address: "4",
+				},
+			},
+			expectedPlan: nil,
+		},
+		{
+			name:     "exist 1 tikv scaled group with less healthy instances",
+			informer: case2,
+			healthyInstances: []instance{
+				{
+					id:      1,
+					address: "1",
+				},
+				{
+					id:      2,
+					address: "2",
+				},
+			},
+			expectedPlan: []*Plan{
+				{
+					Component: TiKV.String(),
+					Count:     1,
+					Labels: []*metapb.StoreLabel{
+						{
+							Key:   groupLabelKey,
+							Value: fmt.Sprintf("%s-0", autoScalingGroupLabelKeyPrefix),
+						},
+					},
+				},
+			},
+		},
+		{
+			name:     "existed other tikv group",
+			informer: case3,
+			healthyInstances: []instance{
+				{
+					id:      1,
+					address: "1",
+				},
+				{
+					id:      2,
+					address: "2",
+				},
+				{
+					id:      3,
+					address: "3",
+				},
+			},
+			expectedPlan: nil,
+		},
+	}
+
+	for _, testcase := range testcases {
+		c.Log(testcase.name)
+		plans := getScaledTiKVGroups(testcase.informer, testcase.healthyInstances)
+		if testcase.expectedPlan == nil {
+			c.Assert(plans, IsNil)
+		} else {
+			c.Assert(plans, DeepEquals, testcase.expectedPlan)
+		}
+	}
+}
+
+type mockQuerier struct{}
+
+func (q *mockQuerier) Query(options *QueryOptions) (QueryResult, error) {
+	result := make(QueryResult)
+	for _, addr := range options.addresses {
+		result[addr] = mockResultValue
+	}
+
+	return result, nil
+}
+
+func (s *calculationTestSuite) TestGetTotalCPUUseTime(c *C) {
+	querier := &mockQuerier{}
+	instances := []instance{
+		{
+			address: "1",
+			id:      1,
+		},
+		{
+			address: "2",
+			id:      2,
+		},
+		{
+			address: "3",
+			id:      3,
+		},
+	}
+	totalCPUUseTime, _ := getTotalCPUUseTime(querier, TiDB, instances, time.Now(), 0)
+	expected := mockResultValue * float64(len(instances))
+	c.Assert(math.Abs(expected-totalCPUUseTime) < 1e-6, IsTrue)
+}
+
+func (s *calculationTestSuite) TestGetTotalCPUQuota(c *C) {
+	querier := &mockQuerier{}
+	instances := []instance{
+		{
+			address: "1",
+			id:      1,
+		},
+		{
+			address: "2",
+			id:      2,
+		},
+		{
+			address: "3",
+			id:      3,
+		},
+	}
+	totalCPUQuota, _ := getTotalCPUQuota(querier, TiDB, instances, time.Now())
+	expected := uint64(mockResultValue * float64(len(instances)*millicores))
+	c.Assert(totalCPUQuota, Equals, expected)
+}
+
+func (s *calculationTestSuite) TestGetScaledTiDBGroups(c *C) {
+	case1 := newMockTiDBInformer()
+	case1.SetTiDBs([]*TiDBInfo{
+		{
+			Address: "tidb-0",
+			Labels: map[string]string{
+				groupLabelKey: fmt.Sprintf("%s-0", autoScalingGroupLabelKeyPrefix),
+			},
+		},
+		{
+			Address: "tidb-1",
+			Labels: map[string]string{
+				groupLabelKey: fmt.Sprintf("%s-0", autoScalingGroupLabelKeyPrefix),
+			},
+		},
+		{
+			Address: "tidb-2",
+			Labels:  map[string]string{},
+		},
+	})
+	testcases := []struct {
+		name             string
+		informer         tidbInformer
+		healthyInstances []instance
+		expectedPlan     []*Plan
+	}{
+		{
+			name:     "exist 1 scaled tidb group",
+			informer: case1,
+			healthyInstances: []instance{
+				{
+					id:      0,
+					address: "tidb-0",
+				},
+				{
+					id:      1,
+					address: "tidb-1",
+				},
+				{
+					id:      2,
+					address: "tidb-2",
+				},
+			},
+			expectedPlan: []*Plan{
+				{
+					Component: TiDB.String(),
+					Count:     2,
+					Labels: []*metapb.StoreLabel{
+						{
+							Key:   groupLabelKey,
+							Value: fmt.Sprintf("%s-0", autoScalingGroupLabelKeyPrefix),
+						},
+					},
+				},
+			},
+		},
+		{
+			name:     "exist 1 tidb scaled group with less healthy instances",
+			informer: case1,
+			healthyInstances: []instance{
+				{
+					id:      1,
+					address: "tidb-1",
+				},
+				{
+					id:      2,
+					address: "tidb-2",
+				},
+			},
+			expectedPlan: []*Plan{
+				{
+					Component: TiDB.String(),
+					Count:     1,
+					Labels: []*metapb.StoreLabel{
+						{
+							Key:   groupLabelKey,
+							Value: fmt.Sprintf("%s-0", autoScalingGroupLabelKeyPrefix),
+						},
+					},
+				},
+			},
+		},
+	}
+	for _, testcase := range testcases {
+		c.Log(testcase.name)
+		plans := getScaledTiDBGroups(testcase.informer, testcase.healthyInstances)
+		if testcase.expectedPlan == nil {
+			c.Assert(plans, IsNil)
+		} else {
+			c.Assert(plans, DeepEquals, testcase.expectedPlan)
+		}
+	}
+}
+
+type mockTidbInformer struct {
+	tidbs map[string]*TiDBInfo
+}
+
+func newMockTiDBInformer() *mockTidbInformer {
+	return &mockTidbInformer{
+		tidbs: map[string]*TiDBInfo{},
+	}
+}
+
+// GetTiDB implements TiDBInformer.GetTiDB
+func (mc *mockTidbInformer) GetTiDB(address string) *TiDBInfo {
+	return mc.tidbs[address]
+}
+
+// SetTiDBs set multiple TiDB
+func (mc *mockTidbInformer) SetTiDBs(tidbs []*TiDBInfo) {
+	for _, tidb := range tidbs {
+		mc.tidbs[tidb.Address] = tidb
+	}
+}
diff --git a/pkg/autoscaling/handler.go b/pkg/autoscaling/handler.go
index de257c33369..dd83eba0fc0 100644
--- a/pkg/autoscaling/handler.go
+++ b/pkg/autoscaling/handler.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,68 +18,11 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/cluster"
 	"github.com/unrolled/render"
 )
 
-// Strategy within a HTTP request provides rules and resources to help make decision for auto scaling.
-type Strategy struct {
-	Rules                []*Rule                `json:"rules"`
-	Resources            []*Resource            `json:"resources"`
-	ResourceExpectations []*ResourceExpectation `json:"resource_expectations"`
-}
-
-// Rule is a set of constraints for a kind of component.
-type Rule struct {
-	Component               string       `json:"component"`
-	CPURule                 *CPURule     `json:"cpu_rule,omitempty"`
-	StorageRule             *StorageRule `json:"storage_rule,omitempty"`
-	ScaleOutIntervalSeconds uint64       `json:"scale_out_interval_seconds"`
-	ScaleInIntervalSeconds  uint64       `json:"scale_in_interval_seconds"`
-}
-
-// CPURule is the constraints about CPU.
-type CPURule struct {
-	MaxThreshold  float64  `json:"max_threshold"`
-	MinThreshold  float64  `json:"min_threshold"`
-	MaxCount      uint64   `json:"max_count"`
-	ResourceTypes []string `json:"resource_types"`
-}
-
-// StorageRule is the constraints about storage.
-type StorageRule struct {
-	MinThreshold  float64  `json:"min_threshold"`
-	MaxCount      uint64   `json:"max_count"`
-	ResourceTypes []string `json:"resource_types"`
-}
-
-// Resource represents a kind of resource set including CPU, memory, storage.
-type Resource struct {
-	ResourceType string `json:"resource_type"`
-	// The basic unit of CPU is milli-core.
-	CPU uint64 `json:"cpu"`
-	// The basic unit of memory is byte.
-	Memory uint64 `json:"memory"`
-	// The basic unit of storage is byte.
-	Storage uint64 `json:"storage"`
-}
-
-// Plan is the final result of auto scaling, which indicates how to scale in or scale out.
-type Plan struct {
-	Component    string               `json:"component"`
-	Count        uint64               `json:"count"`
-	ResourceType string               `json:"resource_type"`
-	Labels       []*metapb.StoreLabel `json:"labels"`
-}
-
-// ResourceExpectation is expectation of resource.
-type ResourceExpectation struct {
-	Component      string `json:"component"`
-	CPUExpectation uint64 `json:"cpu_expectation"`
-	Count          uint64 `json:"count"`
-}
-
 // HTTPHandler is a handler to handle the auto scaling HTTP request.
 type HTTPHandler struct {
 	svr *server.Server
@@ -95,6 +38,11 @@ func NewHTTPHandler(svr *server.Server, rd *render.Render) *HTTPHandler {
 }
 
 func (h *HTTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	rc := h.svr.GetRaftCluster()
+	if rc == nil {
+		h.rd.JSON(w, http.StatusInternalServerError, cluster.ErrNotBootstrapped.Error())
+		return
+	}
 	data, err := ioutil.ReadAll(r.Body)
 	r.Body.Close()
 	if err != nil {
@@ -108,11 +56,6 @@ func (h *HTTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	plan := calculate(&strategy)
+	plan := calculate(rc, h.svr.GetPDServerConfig(), &strategy)
 	h.rd.JSON(w, http.StatusOK, plan)
 }
-
-// TODO: migrate the basic logic from operator.
-func calculate(strategy *Strategy) *Plan {
-	return &Plan{}
-}
diff --git a/pkg/autoscaling/prometheus.go b/pkg/autoscaling/prometheus.go
new file mode 100644
index 00000000000..73c56640ce6
--- /dev/null
+++ b/pkg/autoscaling/prometheus.go
@@ -0,0 +1,214 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package autoscaling
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"strings"
+	"time"
+
+	"github.com/pingcap/errors"
+	"github.com/pingcap/log"
+	promClient "github.com/prometheus/client_golang/api"
+	promAPI "github.com/prometheus/client_golang/api/prometheus/v1"
+	promModel "github.com/prometheus/common/model"
+	"go.uber.org/zap"
+)
+
+const (
+	tikvSumCPUUsageMetricsPattern = `sum(increase(tikv_thread_cpu_seconds_total[%s])) by (instance, kubernetes_namespace)`
+	tidbSumCPUUsageMetricsPattern = `sum(increase(process_cpu_seconds_total{job="tidb"}[%s])) by (instance, kubernetes_namespace)`
+	tikvCPUQuotaMetricsPattern    = `tikv_server_cpu_cores_quota`
+	tidbCPUQuotaMetricsPattern    = `tidb_server_maxprocs`
+	instanceLabelName             = "instance"
+	namespaceLabelName            = "kubernetes_namespace"
+	addressFormat                 = "pod-name.peer-svc.namespace.svc:port"
+
+	httpRequestTimeout = 5 * time.Second
+)
+
+// PrometheusQuerier query metrics from Prometheus
+type PrometheusQuerier struct {
+	api promAPI.API
+}
+
+// NewPrometheusQuerier returns a PrometheusQuerier
+func NewPrometheusQuerier(client promClient.Client) *PrometheusQuerier {
+	return &PrometheusQuerier{
+		api: promAPI.NewAPI(client),
+	}
+}
+
+type promQLBuilderFn func(*QueryOptions) (string, error)
+
+var queryBuilderFnMap = map[MetricType]promQLBuilderFn{
+	CPUQuota: buildCPUQuotaPromQL,
+	CPUUsage: buildCPUUsagePromQL,
+}
+
+// Query do the real query on Prometheus and returns metric value for each instance
+func (prom *PrometheusQuerier) Query(options *QueryOptions) (QueryResult, error) {
+	builderFn, ok := queryBuilderFnMap[options.metric]
+	if !ok {
+		return nil, errors.Errorf("unsupported metric type %v", options.metric)
+	}
+
+	query, err := builderFn(options)
+	if err != nil {
+		return nil, err
+	}
+
+	resp, err := prom.queryMetricsFromPrometheus(query, options.timestamp)
+	if err != nil {
+		return nil, err
+	}
+
+	result, err := extractInstancesFromResponse(resp, options.addresses)
+	if err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}
+
+func (prom *PrometheusQuerier) queryMetricsFromPrometheus(query string, timestamp time.Time) (promModel.Value, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), httpRequestTimeout)
+	defer cancel()
+
+	resp, warnings, err := prom.api.Query(ctx, query, timestamp)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if warnings != nil && len(warnings) > 0 {
+		log.Warn("prometheus query returns with warnings", zap.Strings("warnings", warnings))
+	}
+
+	return resp, nil
+}
+
+func extractInstancesFromResponse(resp promModel.Value, addresses []string) (QueryResult, error) {
+	if resp == nil {
+		return nil, errors.New("metrics response from Prometheus is empty")
+	}
+
+	if resp.Type() != promModel.ValVector {
+		return nil, errors.Errorf("expected vector type values, got %s", resp.Type().String())
+	}
+
+	vector, ok := resp.(promModel.Vector)
+
+	if !ok {
+		return nil, errors.New("type conversion error")
+	}
+
+	if len(vector) == 0 {
+		return nil, errors.New("no results returned from Prometheus")
+	}
+
+	instancesSet := map[string]string{}
+	for _, addr := range addresses {
+		instanceName, err := getInstanceNameFromAddress(addr)
+		if err == nil {
+			instancesSet[instanceName] = addr
+		}
+	}
+
+	result := make(QueryResult)
+
+	for _, sample := range vector {
+		podName, ok := sample.Metric[instanceLabelName]
+		if !ok {
+			continue
+		}
+
+		namespace, ok := sample.Metric[namespaceLabelName]
+		if !ok {
+			continue
+		}
+
+		instanceName := buildInstanceIdentifier(string(podName), string(namespace))
+
+		if addr, ok := instancesSet[string(instanceName)]; ok {
+			result[addr] = float64(sample.Value)
+		}
+	}
+
+	return result, nil
+}
+
+var cpuUsagePromQLTemplate = map[ComponentType]string{
+	TiDB: tidbSumCPUUsageMetricsPattern,
+	TiKV: tikvSumCPUUsageMetricsPattern,
+}
+
+var cpuQuotaPromQLTemplate = map[ComponentType]string{
+	TiDB: tidbCPUQuotaMetricsPattern,
+	TiKV: tikvCPUQuotaMetricsPattern,
+}
+
+func buildCPUQuotaPromQL(options *QueryOptions) (string, error) {
+	pattern, ok := cpuQuotaPromQLTemplate[options.component]
+	if !ok {
+		return "", errors.Errorf("unsupported component type %v", options.component)
+	}
+
+	query := pattern
+	return query, nil
+}
+
+func buildCPUUsagePromQL(options *QueryOptions) (string, error) {
+	pattern, ok := cpuUsagePromQLTemplate[options.component]
+	if !ok {
+		return "", errors.Errorf("unsupported component type %v", options.component)
+	}
+
+	query := fmt.Sprintf(pattern, options.duration.String())
+	return query, nil
+}
+
+// this function assumes that addr is already a valid resolvable address
+// returns in format "podname_namespace"
+func getInstanceNameFromAddress(addr string) (string, error) {
+	// In K8s, a StatefulSet pod address is composed of pod-name.peer-svc.namespace.svc:port
+	// Extract the hostname part without port
+	hostname := addr
+	portColonIdx := strings.LastIndex(addr, ":")
+	if portColonIdx >= 0 {
+		hostname = addr[:portColonIdx]
+	}
+
+	// Just to make sure it is not an IP address
+	ip := net.ParseIP(hostname)
+	if ip != nil {
+		// Hostname is an IP address, return the whole address
+		return "", errors.Errorf("address %s is an ip address", addr)
+	}
+
+	parts := strings.Split(hostname, ".")
+	if len(parts) < 4 {
+		return "", errors.Errorf("address %s does not match the expected format %s", addr, addressFormat)
+	}
+
+	podName, namespace := parts[0], parts[2]
+
+	return buildInstanceIdentifier(podName, namespace), nil
+}
+
+func buildInstanceIdentifier(podName string, namespace string) string {
+	return fmt.Sprintf("%s_%s", podName, namespace)
+}
diff --git a/pkg/autoscaling/prometheus_test.go b/pkg/autoscaling/prometheus_test.go
new file mode 100644
index 00000000000..b7c488b4cfd
--- /dev/null
+++ b/pkg/autoscaling/prometheus_test.go
@@ -0,0 +1,326 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package autoscaling
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"math"
+	"net/http"
+	"net/url"
+	"strings"
+	"testing"
+	"time"
+
+	. "github.com/pingcap/check"
+	promClient "github.com/prometheus/client_golang/api"
+)
+
+const (
+	mockDuration                = 1 * time.Second
+	mockClusterName             = "mock"
+	mockTiDBInstanceNamePattern = "%s-tidb-%d"
+	mockTiKVInstanceNamePattern = "%s-tikv-%d"
+	mockResultValue             = 1.0
+	mockKubernetesNamespace     = "mock"
+
+	instanceCount = 3
+)
+
+func TestPrometheus(t *testing.T) {
+	TestingT(t)
+}
+
+var _ = Suite(&testPrometheusQuerierSuite{})
+
+var podNameTemplate = map[ComponentType]string{
+	TiDB: mockTiDBInstanceNamePattern,
+	TiKV: mockTiKVInstanceNamePattern,
+}
+
+func generatePodNames(component ComponentType) []string {
+	names := make([]string, 0, instanceCount)
+	pattern := podNameTemplate[component]
+	for i := 0; i < instanceCount; i++ {
+		names = append(names, fmt.Sprintf(pattern, mockClusterName, i))
+	}
+	return names
+}
+
+var podNames = map[ComponentType][]string{
+	TiDB: generatePodNames(TiDB),
+	TiKV: generatePodNames(TiKV),
+}
+
+func generateAddresses(component ComponentType) []string {
+	pods := podNames[component]
+	addresses := make([]string, 0, len(pods))
+	for _, pod := range pods {
+		addresses = append(addresses, fmt.Sprintf("%s.%s-%s-peer.%s.svc:20080", pod, mockClusterName, component.String(), mockKubernetesNamespace))
+	}
+	return addresses
+}
+
+var podAddresses = map[ComponentType][]string{
+	TiDB: generateAddresses(TiDB),
+	TiKV: generateAddresses(TiKV),
+}
+
+type testPrometheusQuerierSuite struct{}
+
+// For building mock data only
+type response struct {
+	Status string `json:"status"`
+	Data   data   `json:"data"`
+}
+
+type data struct {
+	ResultType string   `json:"resultType"`
+	Result     []result `json:"result"`
+}
+
+type result struct {
+	Metric metric        `json:"metric"`
+	Value  []interface{} `json:"value"`
+}
+
+type metric struct {
+	Cluster             string `json:"cluster,omitempty"`
+	Instance            string `json:"instance"`
+	Job                 string `json:"job,omitempty"`
+	KubernetesNamespace string `json:"kubernetes_namespace"`
+}
+
+type normalClient struct {
+	mockData map[string]*response
+}
+
+func doURL(ep string, args map[string]string) *url.URL {
+	path := ep
+	for k, v := range args {
+		path = strings.Replace(path, ":"+k, v, -1)
+	}
+	u := &url.URL{
+		Host: "test:9090",
+		Path: path,
+	}
+	return u
+}
+
+func (c *normalClient) buildCPUMockData(component ComponentType) {
+	pods := podNames[component]
+	cpuUsageQuery := fmt.Sprintf(cpuUsagePromQLTemplate[component], mockDuration)
+	cpuQuotaQuery := cpuQuotaPromQLTemplate[component]
+
+	results := make([]result, 0)
+	for i := 0; i < instanceCount; i++ {
+		results = append(results, result{
+			Value: []interface{}{time.Now().Unix(), fmt.Sprintf("%f", mockResultValue)},
+			Metric: metric{
+				Instance:            pods[i],
+				Cluster:             mockClusterName,
+				KubernetesNamespace: mockKubernetesNamespace,
+			},
+		})
+	}
+
+	response := &response{
+		Status: "success",
+		Data: data{
+			ResultType: "vector",
+			Result:     results,
+		},
+	}
+
+	c.mockData[cpuUsageQuery] = response
+	c.mockData[cpuQuotaQuery] = response
+}
+
+func (c *normalClient) buildMockData() {
+	c.buildCPUMockData(TiDB)
+	c.buildCPUMockData(TiKV)
+}
+
+func makeJSONResponse(promResp *response) (*http.Response, []byte, error) {
+	body, err := json.Marshal(promResp)
+	if err != nil {
+		return nil, []byte{}, err
+	}
+
+	response := &http.Response{
+		Status:        "200 OK",
+		StatusCode:    200,
+		Proto:         "HTTP/1.1",
+		ProtoMajor:    1,
+		ProtoMinor:    1,
+		Body:          ioutil.NopCloser(bytes.NewBufferString(string(body))),
+		ContentLength: int64(len(body)),
+		Header:        make(http.Header),
+	}
+	response.Header.Add("Content-Type", "application/json")
+
+	return response, body, nil
+}
+
+func (c *normalClient) URL(ep string, args map[string]string) *url.URL {
+	return doURL(ep, args)
+}
+
+func (c *normalClient) Do(_ context.Context, req *http.Request) (response *http.Response, body []byte, warnings promClient.Warnings, err error) {
+	req.ParseForm()
+	query := req.Form.Get("query")
+	response, body, err = makeJSONResponse(c.mockData[query])
+	return
+}
+
+func (s *testPrometheusQuerierSuite) TestRetrieveCPUMetrics(c *C) {
+	client := &normalClient{
+		mockData: make(map[string]*response),
+	}
+	client.buildMockData()
+	querier := NewPrometheusQuerier(client)
+	metrics := []MetricType{CPUQuota, CPUUsage}
+	for component, addresses := range podAddresses {
+		for _, metric := range metrics {
+			options := NewQueryOptions(component, metric, addresses[:len(addresses)-1], time.Now(), mockDuration)
+			result, err := querier.Query(options)
+			c.Assert(err, IsNil)
+			for i := 0; i < len(addresses)-1; i++ {
+				value, ok := result[addresses[i]]
+				c.Assert(ok, IsTrue)
+				c.Assert(math.Abs(value-mockResultValue) < 1e-6, IsTrue)
+			}
+
+			_, ok := result[addresses[len(addresses)-1]]
+			c.Assert(ok, IsFalse)
+		}
+	}
+}
+
+type emptyResponseClient struct{}
+
+func (c *emptyResponseClient) URL(ep string, args map[string]string) *url.URL {
+	return doURL(ep, args)
+}
+
+func (c *emptyResponseClient) Do(_ context.Context, req *http.Request) (r *http.Response, body []byte, warnings promClient.Warnings, err error) {
+	promResp := &response{
+		Status: "success",
+		Data: data{
+			ResultType: "vector",
+			Result:     make([]result, 0),
+		},
+	}
+
+	r, body, err = makeJSONResponse(promResp)
+	return
+}
+
+func (s *testPrometheusQuerierSuite) TestEmptyResponse(c *C) {
+	client := &emptyResponseClient{}
+	querier := NewPrometheusQuerier(client)
+	options := NewQueryOptions(TiDB, CPUUsage, podAddresses[TiDB], time.Now(), mockDuration)
+	result, err := querier.Query(options)
+	c.Assert(result, IsNil)
+	c.Assert(err, NotNil)
+}
+
+type errorHTTPStatusClient struct{}
+
+func (c *errorHTTPStatusClient) URL(ep string, args map[string]string) *url.URL {
+	return doURL(ep, args)
+}
+
+func (c *errorHTTPStatusClient) Do(_ context.Context, req *http.Request) (r *http.Response, body []byte, warnings promClient.Warnings, err error) {
+	promResp := &response{}
+
+	r, body, err = makeJSONResponse(promResp)
+
+	r.StatusCode = 500
+	r.Status = "500 Internal Server Error"
+
+	return
+}
+
+func (s *testPrometheusQuerierSuite) TestErrorHTTPStatus(c *C) {
+	client := &errorHTTPStatusClient{}
+	querier := NewPrometheusQuerier(client)
+	options := NewQueryOptions(TiDB, CPUUsage, podAddresses[TiDB], time.Now(), mockDuration)
+	result, err := querier.Query(options)
+	c.Assert(result, IsNil)
+	c.Assert(err, NotNil)
+}
+
+type errorPrometheusStatusClient struct{}
+
+func (c *errorPrometheusStatusClient) URL(ep string, args map[string]string) *url.URL {
+	return doURL(ep, args)
+}
+
+func (c *errorPrometheusStatusClient) Do(_ context.Context, req *http.Request) (r *http.Response, body []byte, warnings promClient.Warnings, err error) {
+	promResp := &response{
+		Status: "error",
+	}
+
+	r, body, err = makeJSONResponse(promResp)
+	return
+}
+
+func (s *testPrometheusQuerierSuite) TestErrorPrometheusStatus(c *C) {
+	client := &errorPrometheusStatusClient{}
+	querier := NewPrometheusQuerier(client)
+	options := NewQueryOptions(TiDB, CPUUsage, podAddresses[TiDB], time.Now(), mockDuration)
+	result, err := querier.Query(options)
+	c.Assert(result, IsNil)
+	c.Assert(err, NotNil)
+}
+
+func (s *testPrometheusQuerierSuite) TestGetInstanceNameFromAddress(c *C) {
+	testcases := []struct {
+		address              string
+		expectedInstanceName string
+	}{
+		{
+			address:              "test-tikv-0.test-tikv-peer.namespace.svc:20080",
+			expectedInstanceName: "test-tikv-0_namespace",
+		},
+		{
+			address:              "test-tikv-0.test-tikv-peer.namespace.svc",
+			expectedInstanceName: "test-tikv-0_namespace",
+		},
+		{
+			address:              "tidb-0_10080",
+			expectedInstanceName: "",
+		},
+		{
+			address:              "1.2.3.4:2333",
+			expectedInstanceName: "",
+		},
+		{
+			address:              "1.2.3.4",
+			expectedInstanceName: "",
+		},
+	}
+	for _, testcase := range testcases {
+		instanceName, err := getInstanceNameFromAddress(testcase.address)
+		if testcase.expectedInstanceName == "" {
+			c.Assert(err, NotNil)
+		} else {
+			c.Assert(instanceName, Equals, testcase.expectedInstanceName)
+		}
+	}
+}
diff --git a/pkg/autoscaling/querier.go b/pkg/autoscaling/querier.go
new file mode 100644
index 00000000000..a25dfd058c9
--- /dev/null
+++ b/pkg/autoscaling/querier.go
@@ -0,0 +1,48 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package autoscaling
+
+import "time"
+
+// QueryResult stores metrics value for each instance
+type QueryResult map[string]float64
+
+// Querier provides interfaces to query metrics
+type Querier interface {
+	// Query does the real query with options
+	Query(options *QueryOptions) (QueryResult, error)
+}
+
+// QueryOptions includes parameters for later metrics query
+type QueryOptions struct {
+	component ComponentType
+	metric    MetricType
+	addresses []string
+	timestamp time.Time
+	duration  time.Duration
+}
+
+// NewQueryOptions constructs a new QueryOptions for metrics
+// The options will be used to query metrics of `duration` long UNTIL `timestamp`
+// which has `metric` type (CPU, Storage) for a specific `component` type
+// and returns metrics value for each instance in `instances`
+func NewQueryOptions(component ComponentType, metric MetricType, addresses []string, timestamp time.Time, duration time.Duration) *QueryOptions {
+	return &QueryOptions{
+		component,
+		metric,
+		addresses,
+		timestamp,
+		duration,
+	}
+}
diff --git a/pkg/autoscaling/service.go b/pkg/autoscaling/service.go
index 5995ac38d07..4f0c4e2f375 100644
--- a/pkg/autoscaling/service.go
+++ b/pkg/autoscaling/service.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/pingcap/pd/v4/pkg/apiutil/serverapi"
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/pkg/apiutil/serverapi"
+	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 	"github.com/urfave/negroni"
 )
diff --git a/pkg/autoscaling/types.go b/pkg/autoscaling/types.go
new file mode 100644
index 00000000000..5f9d122bf51
--- /dev/null
+++ b/pkg/autoscaling/types.go
@@ -0,0 +1,140 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package autoscaling
+
+import (
+	"strings"
+
+	"github.com/pingcap/kvproto/pkg/metapb"
+)
+
+// Strategy within a HTTP request provides rules and resources to help make decision for auto scaling.
+type Strategy struct {
+	Rules     []*Rule     `json:"rules"`
+	Resources []*Resource `json:"resources"`
+}
+
+// Rule is a set of constraints for a kind of component.
+type Rule struct {
+	Component   string       `json:"component"`
+	CPURule     *CPURule     `json:"cpu_rule,omitempty"`
+	StorageRule *StorageRule `json:"storage_rule,omitempty"`
+}
+
+// CPURule is the constraints about CPU.
+type CPURule struct {
+	MaxThreshold  float64  `json:"max_threshold"`
+	MinThreshold  float64  `json:"min_threshold"`
+	ResourceTypes []string `json:"resource_types"`
+}
+
+// StorageRule is the constraints about storage.
+type StorageRule struct {
+	MinThreshold  float64  `json:"min_threshold"`
+	ResourceTypes []string `json:"resource_types"`
+}
+
+// Resource represents a kind of resource set including CPU, memory, storage.
+type Resource struct {
+	ResourceType string `json:"resource_type"`
+	// The basic unit of CPU is milli-core.
+	CPU uint64 `json:"cpu"`
+	// The basic unit of memory is byte.
+	Memory uint64 `json:"memory"`
+	// The basic unit of storage is byte.
+	Storage uint64 `json:"storage"`
+	Count   uint64 `json:"count"`
+}
+
+// Plan is the final result of auto scaling, which indicates how to scale in or scale out.
+type Plan struct {
+	Component    string               `json:"component"`
+	Count        uint64               `json:"count"`
+	ResourceType string               `json:"resource_type"`
+	Labels       []*metapb.StoreLabel `json:"labels"`
+}
+
+// ComponentType distinguishes different kinds of components.
+type ComponentType int
+
+const (
+	// TiKV indicates the TiKV component
+	TiKV ComponentType = iota
+	// TiDB indicates the TiDB component
+	TiDB
+)
+
+func (c ComponentType) String() string {
+	switch c {
+	case TiKV:
+		return "tikv"
+	case TiDB:
+		return "tidb"
+	default:
+		return "unknown"
+	}
+}
+
+// MetricType distinguishes different kinds of metrics
+type MetricType int
+
+const (
+	// CPUUsage is used cpu time in the duration
+	CPUUsage MetricType = iota
+	// CPUQuota is cpu cores quota for each instance
+	CPUQuota
+)
+
+func (c MetricType) String() string {
+	switch c {
+	case CPUUsage:
+		return "cpu_usage"
+	case CPUQuota:
+		return "cpu_quota"
+	default:
+		return "unknown"
+	}
+}
+
+type instance struct {
+	id      uint64
+	address string
+}
+
+// TiDBInformer is used to fetch tidb info
+// TODO: implement TiDBInformer
+type tidbInformer interface {
+	GetTiDB(address string) *TiDBInfo
+}
+
+// TiDBInfo record the detail tidb info
+type TiDBInfo struct {
+	Address string
+	Labels  map[string]string
+}
+
+// GetLabelValue returns a label's value (if exists).
+func (t *TiDBInfo) getLabelValue(key string) string {
+	for k, v := range t.getLabels() {
+		if strings.EqualFold(k, key) {
+			return v
+		}
+	}
+	return ""
+}
+
+// GetLabels returns the labels of the tidb.
+func (t *TiDBInfo) getLabels() map[string]string {
+	return t.Labels
+}
diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go
index 7e07f16dbae..4ec644cf01b 100644
--- a/pkg/cache/cache.go
+++ b/pkg/cache/cache.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/cache/cache_test.go b/pkg/cache/cache_test.go
index dc9fae3eb34..890145db4c9 100644
--- a/pkg/cache/cache_test.go
+++ b/pkg/cache/cache_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/cache/fifo.go b/pkg/cache/fifo.go
index d278430e138..6a7bfcab49f 100644
--- a/pkg/cache/fifo.go
+++ b/pkg/cache/fifo.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/cache/lru.go b/pkg/cache/lru.go
index 28a6b32a460..2e11664ac0c 100644
--- a/pkg/cache/lru.go
+++ b/pkg/cache/lru.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/cache/ttl.go b/pkg/cache/ttl.go
index f8ab4351b02..af6d789e041 100644
--- a/pkg/cache/ttl.go
+++ b/pkg/cache/ttl.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/cache/two_queue.go b/pkg/cache/two_queue.go
index 54cf18894aa..e2bf94594c1 100644
--- a/pkg/cache/two_queue.go
+++ b/pkg/cache/two_queue.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/codec/codec.go b/pkg/codec/codec.go
index b58b74078fc..91a897fa9a9 100644
--- a/pkg/codec/codec.go
+++ b/pkg/codec/codec.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ import (
 	"bytes"
 	"encoding/binary"
 
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
 )
 
 var (
diff --git a/pkg/codec/codec_test.go b/pkg/codec/codec_test.go
index cf15f8ab3f8..a5435b67e44 100644
--- a/pkg/codec/codec_test.go
+++ b/pkg/codec/codec_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/component/manager.go b/pkg/component/manager.go
index 0b2cd069d53..4664a2d5722 100644
--- a/pkg/component/manager.go
+++ b/pkg/component/manager.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import (
 	"sync"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server/core"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/component/manager_test.go b/pkg/component/manager_test.go
index 41ec832bc1d..3c02a162729 100644
--- a/pkg/component/manager_test.go
+++ b/pkg/component/manager_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ import (
 	"testing"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/kv"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/kv"
 )
 
 func Test(t *testing.T) {
diff --git a/pkg/dashboard/adapter/config.go b/pkg/dashboard/adapter/config.go
index 3cff1a55471..14dc94e2858 100644
--- a/pkg/dashboard/adapter/config.go
+++ b/pkg/dashboard/adapter/config.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ package adapter
 import (
 	"github.com/pingcap-incubator/tidb-dashboard/pkg/config"
 
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/server"
 )
 
 // GenDashboardConfig generates a configuration for Dashboard Server.
diff --git a/pkg/dashboard/adapter/manager.go b/pkg/dashboard/adapter/manager.go
index f469a1ae6f5..8b9761d0aa4 100644
--- a/pkg/dashboard/adapter/manager.go
+++ b/pkg/dashboard/adapter/manager.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,9 +24,10 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/logutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/cluster"
+	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/logutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/cluster"
 )
 
 var (
@@ -195,7 +196,7 @@ func (m *Manager) startService() {
 		return
 	}
 	if err := m.service.Start(m.ctx); err != nil {
-		log.Error("Can not start dashboard server", zap.Error(err))
+		log.Error("Can not start dashboard server", errs.ZapError(errs.ErrStartDashboard, err))
 	} else {
 		log.Info("Dashboard server is started")
 	}
@@ -206,7 +207,7 @@ func (m *Manager) stopService() {
 		return
 	}
 	if err := m.service.Stop(context.Background()); err != nil {
-		log.Error("Stop dashboard server error", zap.Error(err))
+		log.Error("Stop dashboard server error", errs.ZapError(errs.ErrStopDashboard, err))
 	} else {
 		log.Info("Dashboard server is stopped")
 	}
diff --git a/pkg/dashboard/adapter/redirector.go b/pkg/dashboard/adapter/redirector.go
index c24ddef04bd..65541619236 100644
--- a/pkg/dashboard/adapter/redirector.go
+++ b/pkg/dashboard/adapter/redirector.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/dashboard/dashboard.go b/pkg/dashboard/dashboard.go
index 26441fbbec2..6c11b40d625 100644
--- a/pkg/dashboard/dashboard.go
+++ b/pkg/dashboard/dashboard.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,10 +24,10 @@ import (
 	"github.com/pingcap-incubator/tidb-dashboard/pkg/config"
 	"github.com/pingcap-incubator/tidb-dashboard/pkg/uiserver"
 
-	"github.com/pingcap/pd/v4/pkg/dashboard/adapter"
-	"github.com/pingcap/pd/v4/pkg/dashboard/keyvisual"
-	ui "github.com/pingcap/pd/v4/pkg/dashboard/uiserver"
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/pkg/dashboard/adapter"
+	"github.com/tikv/pd/pkg/dashboard/keyvisual"
+	ui "github.com/tikv/pd/pkg/dashboard/uiserver"
+	"github.com/tikv/pd/server"
 )
 
 var (
diff --git a/pkg/dashboard/keyvisual/input/core.go b/pkg/dashboard/keyvisual/input/core.go
index c20444bb0a1..6f3f85080d1 100644
--- a/pkg/dashboard/keyvisual/input/core.go
+++ b/pkg/dashboard/keyvisual/input/core.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@ package input
 import (
 	regionpkg "github.com/pingcap-incubator/tidb-dashboard/pkg/keyvisual/region"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/core"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/dashboard/keyvisual/keyvisual.go b/pkg/dashboard/keyvisual/keyvisual.go
index 55e8cffbd2b..3d3544fe362 100644
--- a/pkg/dashboard/keyvisual/keyvisual.go
+++ b/pkg/dashboard/keyvisual/keyvisual.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@ package keyvisual
 import (
 	"github.com/pingcap-incubator/tidb-dashboard/pkg/keyvisual/region"
 
-	"github.com/pingcap/pd/v4/pkg/dashboard/keyvisual/input"
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/pkg/dashboard/keyvisual/input"
+	"github.com/tikv/pd/server"
 )
 
 // GenCustomDataProvider generates a custom DataProvider for the dashboard keyvisual package.
diff --git a/pkg/dashboard/uiserver/embedded_assets_rewriter.go b/pkg/dashboard/uiserver/embedded_assets_rewriter.go
index b7a77a98242..042e25f48cd 100644
--- a/pkg/dashboard/uiserver/embedded_assets_rewriter.go
+++ b/pkg/dashboard/uiserver/embedded_assets_rewriter.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/dashboard/without_dashboard.go b/pkg/dashboard/without_dashboard.go
index 9333de5d479..75a82bbb5dd 100644
--- a/pkg/dashboard/without_dashboard.go
+++ b/pkg/dashboard/without_dashboard.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import (
 
 	"github.com/pingcap-incubator/tidb-dashboard/pkg/config"
 
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/server"
 )
 
 var (
diff --git a/pkg/errs/errno.go b/pkg/errs/errno.go
new file mode 100644
index 00000000000..6f738e63000
--- /dev/null
+++ b/pkg/errs/errno.go
@@ -0,0 +1,111 @@
+// Copyright 2020 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package errs
+
+import "github.com/pingcap/errors"
+
+// tso errors
+var (
+	ErrInvalidTimestamp    = errors.Normalize("invalid timestamp", errors.RFCCodeText("PD:tso:ErrInvalidTimestamp"))
+	ErrLogicOverflow       = errors.Normalize("logic part overflow", errors.RFCCodeText("PD:tso:ErrLogicOverflow"))
+	ErrIncorrectSystemTime = errors.Normalize("incorrect system time", errors.RFCCodeText("PD:tso:ErrIncorrectSystemTime"))
+)
+
+// adapter errors
+var (
+	ErrStartDashboard = errors.Normalize("start dashboard failed", errors.RFCCodeText("PD:adapter:ErrStartDashboard"))
+	ErrStopDashboard  = errors.Normalize("stop dashboard failed", errors.RFCCodeText("PD:adapter:ErrStopDashboard"))
+)
+
+// member errors
+var (
+	ErretcdLeaderNotFound     = errors.Normalize("etcd leader not found", errors.RFCCodeText("PD:member:ErretcdLeaderNotFound"))
+	ErrGetLeader              = errors.Normalize("get leader failed", errors.RFCCodeText("PD:member:ErrGetLeader"))
+	ErrDeleteLeaderKey        = errors.Normalize("delete leader key failed", errors.RFCCodeText("PD:member:ErrDeleteLeaderKey"))
+	ErrLoadLeaderPriority     = errors.Normalize("load leader priority failed", errors.RFCCodeText("PD:member:ErrLoadLeaderPriority"))
+	ErrLoadetcdLeaderPriority = errors.Normalize("load etcd leader priority failed", errors.RFCCodeText("PD:member:ErrLoadetcdLeaderPriority"))
+	ErrTransferetcdLeader     = errors.Normalize("transfer etcd leader failed", errors.RFCCodeText("PD:member:ErrTransferetcdLeader"))
+	ErrWatcherCancel          = errors.Normalize("watcher canceled", errors.RFCCodeText("PD:member:ErrWatcherCancel"))
+	ErrMarshalLeader          = errors.Normalize("marshal leader failed", errors.RFCCodeText("PD:member:ErrMarshalLeader"))
+)
+
+// client errors
+var (
+	ErrCloseGRPCConn   = errors.Normalize("close gRPC connection failed", errors.RFCCodeText("PD:client:ErrCloseGRPCConn"))
+	ErrUpdateLeader    = errors.Normalize("update leader failed", errors.RFCCodeText("PD:client:ErrUpdateLeader"))
+	ErrCreateTSOStream = errors.Normalize("create TSO stream failed", errors.RFCCodeText("PD:client:ErrCreateTSOStream"))
+	ErrGetTSO          = errors.Normalize("get TSO failed", errors.RFCCodeText("PD:client:ErrGetTSO"))
+	ErrGetClusterID    = errors.Normalize("get cluster ID failed", errors.RFCCodeText("PD:client:ErrGetClusterID"))
+)
+
+// placement errors
+var (
+	ErrRuleContent   = errors.Normalize("invalid rule content, %s", errors.RFCCodeText("PD:placement:ErrRuleContent"))
+	ErrLoadRule      = errors.Normalize("load rule failed", errors.RFCCodeText("PD:placement:ErrLoadRule"))
+	ErrLoadRuleGroup = errors.Normalize("load rule group failed", errors.RFCCodeText("PD:placement:ErrLoadRuleGroup"))
+	ErrBuildRuleList = errors.Normalize("build rule list failed, %s", errors.RFCCodeText("PD:placement:ErrBuildRuleList"))
+)
+
+// kv errors
+var (
+	ErrEtcdKVSave   = errors.Normalize("etcd KV save failed", errors.RFCCodeText("PD:kv:ErrEtcdKVSave"))
+	ErrEtcdKVRemove = errors.Normalize("etcd KV remove failed", errors.RFCCodeText("PD:kv:ErrEtcdKVRemove"))
+)
+
+// apiutil errors
+var (
+	ErrRequestHTTP   = errors.Normalize("send HTTP request failed", errors.RFCCodeText("PD:apiutil:ErrRequestHTTP"))
+	ErrReadHTTPBody  = errors.Normalize("read HTTP body failed", errors.RFCCodeText("PD:apiutil:ErrReadHTTPBody"))
+	ErrWriteHTTPBody = errors.Normalize("write HTTP body failed", errors.RFCCodeText("PD:apiutil:ErrWriteHTTPBody"))
+)
+
+// cluster errors
+var (
+	ErrPersistStore          = errors.Normalize("failed to persist store", errors.RFCCodeText("PD:cluster:ErrPersistStore"))
+	ErrDeleteRegion          = errors.Normalize("failed to delete region from storage", errors.RFCCodeText("PD:cluster:ErrDeleteRegion"))
+	ErrSaveRegion            = errors.Normalize("failed to save region from storage", errors.RFCCodeText("PD:cluster:ErrSaveRegion"))
+	ErrBuryStore             = errors.Normalize("failed to bury store", errors.RFCCodeText("PD:cluster:ErrBuryStore"))
+	ErrDeleteStore           = errors.Normalize("failed to delete store", errors.RFCCodeText("PD:cluster:ErrDeleteStore"))
+	ErrPersistClusterVersion = errors.Normalize("persist cluster version meet error", errors.RFCCodeText("PD:cluster:ErrPersistClusterVersion"))
+	ErrGetMembers            = errors.Normalize("get members failed", errors.RFCCodeText("PD:cluster:ErrGetMembers"))
+	// TODO: ErrNewHTTPRequest may not be suitable to put in cluster category
+	ErrNewHTTPRequest = errors.Normalize("new HTTP request failed", errors.RFCCodeText("PD:cluster:ErrNewHTTPRequest"))
+)
+
+// metricutil errors
+var (
+	ErrPushGateway = errors.Normalize("push metrics to gateway failed", errors.RFCCodeText("PD:metricutil:ErrPushGateway"))
+)
+
+// etcdutil errors
+var (
+	ErrLoadValue  = errors.Normalize("load value from etcd failed", errors.RFCCodeText("PD:etcdutil:ErrLoadValue"))
+	ErrGetCluster = errors.Normalize("get cluster from remote peer failed", errors.RFCCodeText("PD:etcdutil:ErrGetCluster"))
+)
+
+// server errors
+var (
+	ErrHeartBeatLeaderNil = errors.Normalize("heartbeat nil leader found", errors.RFCCodeText("PD:server:ErrHeartBeatLeaderNil"))
+	ErrSchedulerOperation = errors.Normalize("scheduler operation failed", errors.RFCCodeText("PD:server:ErrSchedulerOperation"))
+	ErrStorageClose       = errors.Normalize("close storage failed", errors.RFCCodeText("PD:server:ErrStorageClose"))
+	ErrDecodeConfig       = errors.Normalize("decode config failed", errors.RFCCodeText("PD:server:ErrDecodeConfig"))
+	ErrSavePersistOptions = errors.Normalize("save persist options failed", errors.RFCCodeText("PD:server:ErrLoadPersistOptions"))
+	ErrLoadPersistOptions = errors.Normalize("load persist options failed", errors.RFCCodeText("PD:server:ErrSavePersistOptions"))
+	ErrCampaignLeader     = errors.Normalize("campaign leader failed", errors.RFCCodeText("PD:server:ErrCampaignLeader"))
+	ErrUpdateTso          = errors.Normalize("update timestamp to tso failed", errors.RFCCodeText("PD:server:ErrSyncTso"))
+	ErrStoreNotFound      = errors.Normalize("store specified not found", errors.RFCCodeText("PD:server:ErrStoreNotFound"))
+	ErrCreateCluster      = errors.Normalize("create cluster error", errors.RFCCodeText("PD:server:ErrCreateCluster"))
+	ErrGRPCHeartbeat      = errors.Normalize("grpc heartbeat error", errors.RFCCodeText("PD:server:ErrGRPCHeartbeat"))
+	ErrSystemTime         = errors.Normalize("system time error", errors.RFCCodeText("PD:server:ErrSystemTime"))
+)
diff --git a/pkg/errs/errors.go b/pkg/errs/errors.go
deleted file mode 100644
index 19bdb00eae7..00000000000
--- a/pkg/errs/errors.go
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2020 PingCAP, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package errs
-
-import "github.com/pingcap/errors"
-
-var (
-	reg = errors.NewRegistry("PD")
-	// ClassIO is IO error class
-	ClassIO = reg.RegisterErrorClass(1, "io")
-	// ClassNetwork is network error class
-	ClassNetwork = reg.RegisterErrorClass(2, "network")
-	// ClassStorage is storage error class
-	ClassStorage = reg.RegisterErrorClass(3, "storage")
-	// ClassInternal is internal error class
-	ClassInternal = reg.RegisterErrorClass(4, "internal")
-	// ClassFormat is format error class
-	ClassFormat = reg.RegisterErrorClass(5, "format")
-	// ClassOther is other error class
-	ClassOther = reg.RegisterErrorClass(6, "other")
-)
-
-// server
-var (
-	// ErrHeartBeatLeaderNil is nil leader in heartbeat
-	ErrHeartBeatLeaderNil = ClassFormat.DefineError().TextualCode("ErrHeartbeatLeaderNil").MessageTemplate("heartbeat nil leader found").Build()
-	// ErrSchedulerOperation is scheduler operation failed
-	ErrSchedulerOperation = ClassInternal.DefineError().TextualCode("ErrSchedulerOperation").MessageTemplate("scheduler %s operation failed").Build()
-	// ErrStorageClose is close storage failed
-	ErrStorageClose = ClassStorage.DefineError().TextualCode("ErrStorageClose").MessageTemplate("close storage failed").Build()
-	// ErrDecodeConfig is decode config failed
-	ErrDecodeConfig = ClassFormat.DefineError().TextualCode("ErrDecodeConfig").MessageTemplate("decode config failed").Build()
-	// ErrSavePersistOptions is save opts failed
-	ErrSavePersistOptions = ClassStorage.DefineError().TextualCode("ErrSavePersistOptions").MessageTemplate("save persist options failed").Build()
-	// ErrLoadPersistOptions is load opts failed
-	ErrLoadPersistOptions = ClassStorage.DefineError().TextualCode("ErrLoadPersistOptions").MessageTemplate("load persist options failed").Build()
-	// ErrEtcdLeaderSave is save leader to etcd error
-	ErrEtcdLeaderSave = ClassStorage.DefineError().TextualCode("ErrEtcdLeaderSave").MessageTemplate("save etcd leader failed").Build()
-	// ErrCampaignLeader is campaign leader failed
-	ErrCampaignLeader = ClassInternal.DefineError().TextualCode("ErrCampaignLeader").MessageTemplate("campaign leader failed").Build()
-	// ErrSyncTso is sync tso error
-	ErrSyncTso = ClassInternal.DefineError().TextualCode("ErrSyncTso").MessageTemplate("sync timestamp with tso failed").Build()
-	// ErrUpdateTso is update tso error
-	ErrUpdateTso = ClassInternal.DefineError().TextualCode("ErrUpdateTso").MessageTemplate("update timestamp to tso failed").Build()
-	// ErrStoreNotFound is store not found
-	ErrStoreNotFound = ClassInternal.DefineError().TextualCode("ErrStoreNotFound").MessageTemplate("store id %d not found").Build()
-	// ErrCreateCluster is create cluster error
-	ErrCreateCluster = ClassInternal.DefineError().TextualCode("ErrCreateCluster").MessageTemplate("create cluster error").Build()
-)
-
-var (
-	// ErrIORead is io error
-	ErrIORead = ClassIO.DefineError().TextualCode("ErrIORead").MessageTemplate("io read error").Build()
-	// ErrHTTPErrorResponse is http error response error
-	ErrHTTPErrorResponse = ClassNetwork.DefineError().TextualCode("ErrHTTPErrorResponse").MessageTemplate("make http error response fail").Build()
-	// ErrHTTPRedirect is http redirect error
-	ErrHTTPRedirect = ClassNetwork.DefineError().TextualCode("ErrHTTPRedirect").MessageTemplate("http redirect many times").Build()
-	// ErrHTTPRequestURL is http request url error
-	ErrHTTPRequestURL = ClassNetwork.DefineError().TextualCode("ErrHTTPRequestURL").MessageTemplate("wrong url in user http request").Build()
-	// ErrGRPCTso is grpc tso error
-	ErrGRPCTso = ClassNetwork.DefineError().TextualCode("ErrGRPCTso").MessageTemplate("grpc tso request fail").Build()
-	// ErrGRPCHeartbeat is grpc heartbeat error
-	ErrGRPCHeartbeat = ClassNetwork.DefineError().TextualCode("ErrGRPCHeartbeat").MessageTemplate("grpc heartbeat request fail").Build()
-	// ErrGRPCClose is grpc close error
-	ErrGRPCClose = ClassNetwork.DefineError().TextualCode("ErrGRPCClose").MessageTemplate("grpc close connection fail").Build()
-	// ErrGRPCSend is grpc send error
-	ErrGRPCSend = ClassNetwork.DefineError().TextualCode("ErrGRPCSend").MessageTemplate("grpc send message fail").Build()
-	// ErrStorageLoad is storage load error
-	ErrStorageLoad = ClassStorage.DefineError().TextualCode("ErrStorageLoad").MessageTemplate("load config from storage error").Build()
-	// ErrStorageSave is storage save error
-	ErrStorageSave = ClassStorage.DefineError().TextualCode("ErrStorageSave").MessageTemplate("save config to storage error").Build()
-	// ErrStorageDelete is storage delete error
-	ErrStorageDelete = ClassStorage.DefineError().TextualCode("ErrStorageDelete").MessageTemplate("delete config from storage error").Build()
-	// ErrStorageEtcdLoad is etcd storage load error
-	ErrStorageEtcdLoad = ClassStorage.DefineError().TextualCode("ErrStorageEtcdLoad").MessageTemplate("load config from storage etcd error").Build()
-	// ErrStorageEtcdSave is etcd storage save error
-	ErrStorageEtcdSave = ClassStorage.DefineError().TextualCode("ErrStorageEtcdSave").MessageTemplate("save config to storage etcd error").Build()
-	// ErrStorageEtcdDelete is etcd storage delete error
-	ErrStorageEtcdDelete = ClassStorage.DefineError().TextualCode("ErrStorageEtcdDelete").MessageTemplate("delete config from storage etcd error").Build()
-	// ErrInternalSchedulerDuplicate is scheduler duplicate
-	ErrInternalSchedulerDuplicate = ClassInternal.DefineError().TextualCode("ErrInternalSchedulerDuplicate").MessageTemplate("duplicate scheduler found").Build()
-	// ErrInternalSchedulerNotFound is scheduler not found
-	ErrInternalSchedulerNotFound = ClassInternal.DefineError().TextualCode("ErrInternalSchedulerNotFound").MessageTemplate("scheduler not found").Build()
-	// ErrInternalSchedulerConfig is scheduler config error
-	ErrInternalSchedulerConfig = ClassInternal.DefineError().TextualCode("ErrInternalSchedulerConfig").MessageTemplate("wrong scheduler config").Build()
-	// ErrInternalRuleInvalid is invalid rule
-	ErrInternalRuleInvalid = ClassInternal.DefineError().TextualCode("ErrInternalRuleInvalid").MessageTemplate("invalid rule found").Build()
-	// ErrInternalRuleDuplicate is duplicate rule
-	ErrInternalRuleDuplicate = ClassInternal.DefineError().TextualCode("ErrInternalRuleDuplicate").MessageTemplate("duplicate rule found").Build()
-	// ErrInternalRuleMismatch is rule mismatch
-	ErrInternalRuleMismatch = ClassInternal.DefineError().TextualCode("ErrInternalRuleMismatch").MessageTemplate("rule key mismatch").Build()
-	// ErrInternalOperatorNotFound is operator not found
-	ErrInternalOperatorNotFound = ClassInternal.DefineError().TextualCode("ErrInternalOperatorNotFound").MessageTemplate("operator not found").Build()
-	// ErrInternalOperatorMerge is operator merge error
-	ErrInternalOperatorMerge = ClassInternal.DefineError().TextualCode("ErrInternalOperatorMerge").MessageTemplate("merge operator should be pair").Build()
-	// ErrInternalOperatorNotStart is operator not start
-	ErrInternalOperatorNotStart = ClassInternal.DefineError().TextualCode("ErrInternalOperatorNotStart").MessageTemplate("operator not start").Build()
-	// ErrInternalOperatorNotEnd is operator not end
-	ErrInternalOperatorNotEnd = ClassInternal.DefineError().TextualCode("ErrInternalOperatorNotEnd").MessageTemplate("operator not end").Build()
-	// ErrInternalOperatorStepUnknown is operator step unknown
-	ErrInternalOperatorStepUnknown = ClassInternal.DefineError().TextualCode("ErrInternalStepUnknown").MessageTemplate("operator step is unknown").Build()
-	// ErrInternalClusterVersionChange is cluster version change error
-	ErrInternalClusterVersionChange = ClassInternal.DefineError().TextualCode("ErrInternalClusterVersionChange").MessageTemplate("cluster version change same time").Build()
-	// ErrInternalRegionKey is region key error
-	ErrInternalRegionKey = ClassInternal.DefineError().TextualCode("ErrInternalRegionKey").MessageTemplate("wrong region key range").Build()
-	// ErrInternalCacheRegionOverflow is cache region overflow
-	ErrInternalCacheRegionOverflow = ClassInternal.DefineError().TextualCode("ErrInternalCacheRegionOverflow").MessageTemplate("cache region overflow").Build()
-	// ErrInternalVersionFeatureNotExist is version feature not exist
-	ErrInternalVersionFeatureNotExist = ClassInternal.DefineError().TextualCode("ErrInternalVersionFeatureNotExist").MessageTemplate("version feature not exist").Build()
-	// ErrFormatParseCmd is parse cmd error
-	ErrFormatParseCmd = ClassFormat.DefineError().TextualCode("ErrFormatParseCmd").MessageTemplate("parse cmd error").Build()
-	// ErrFormatParseClusterVersion is parse cluster version error
-	ErrFormatParseClusterVersion = ClassFormat.DefineError().TextualCode("ErrFormatParseClusterVersion").MessageTemplate("parse cluster version error").Build()
-	// ErrFormatParseURL is parse url error
-	ErrFormatParseURL = ClassFormat.DefineError().TextualCode("ErrFormatParseURL").MessageTemplate("parse url error").Build()
-	// ErrFormatParseHistoryIndex is parse history index error
-	ErrFormatParseHistoryIndex = ClassFormat.DefineError().TextualCode("ErrFormatParseHistoryIndex").MessageTemplate("parse history index error").Build()
-	// ErrOtherInitLog is init log error
-	ErrOtherInitLog = ClassOther.DefineError().TextualCode("ErrOtherInitLog").MessageTemplate("init log fail").Build()
-	// ErrOtherDashboardServer is dashboard server error
-	ErrOtherDashboardServer = ClassOther.DefineError().TextualCode("ErrOtherDashboardServer").MessageTemplate("dashboard server error").Build()
-	// ErrOtherPrometheusPush is prometheus push error
-	ErrOtherPrometheusPush = ClassOther.DefineError().TextualCode("ErrOtherPrometheusPush").MessageTemplate("push to prometheus error").Build()
-	// ErrOtherPluginLoadActionUnknown is plugin action unknown
-	ErrOtherPluginLoadActionUnknown = ClassOther.DefineError().TextualCode("ErrOtherPluginLoadActionUnknown").MessageTemplate("unknown action to load plugin").Build()
-	// ErrOtherPluginFuncNotFound is plugin func not found
-	ErrOtherPluginFuncNotFound = ClassOther.DefineError().TextualCode("ErrOtherPluginFuncNotFound").MessageTemplate("plugin function not found").Build()
-	// ErrOtherSystemTime is system time error
-	ErrOtherSystemTime = ClassOther.DefineError().TextualCode("ErrOtherSystemTime").MessageTemplate("system time error").Build()
-)
diff --git a/pkg/errs/errs.go b/pkg/errs/errs.go
new file mode 100644
index 00000000000..08f83182636
--- /dev/null
+++ b/pkg/errs/errs.go
@@ -0,0 +1,31 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package errs
+
+import (
+	"github.com/pingcap/errors"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+)
+
+// ZapError is used to make the log output easier.
+func ZapError(err *errors.Error, causeError ...error) zap.Field {
+	var e interface{}
+	if len(causeError) == 1 {
+		e = err.Wrap(causeError[0]).FastGenWithCause()
+	} else {
+		e = err.FastGenByArgs()
+	}
+	return zap.Field{Key: "error", Type: zapcore.ErrorType, Interface: e}
+}
diff --git a/pkg/errs/errors_test.go b/pkg/errs/errs_test.go
similarity index 67%
rename from pkg/errs/errors_test.go
rename to pkg/errs/errs_test.go
index ef414809385..70fd1b973b6 100644
--- a/pkg/errs/errors_test.go
+++ b/pkg/errs/errs_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,10 +16,13 @@ package errs
 import (
 	"bytes"
 	"fmt"
-	"github.com/pingcap/log"
-	"go.uber.org/zap"
 	"strings"
 	"testing"
+
+	. "github.com/pingcap/check"
+	"github.com/pingcap/errors"
+	"github.com/pingcap/log"
+	"go.uber.org/zap"
 )
 
 // testingWriter is a WriteSyncer that writes to the the messages.
@@ -48,12 +51,11 @@ type verifyLogger struct {
 	w *testingWriter
 }
 
-func (logger *verifyLogger) Contain(t *testing.T, s string) {
+func (logger *verifyLogger) Message() string {
 	if logger.w.messages == nil {
-		t.Error()
+		return ""
 	}
-	msg := logger.w.messages[len(logger.w.messages)-1]
-	IsContain(t, msg, s)
+	return logger.w.messages[len(logger.w.messages)-1]
 }
 
 func newZapTestLogger(cfg *log.Config, opts ...zap.Option) verifyLogger {
@@ -68,21 +70,25 @@ func newZapTestLogger(cfg *log.Config, opts ...zap.Option) verifyLogger {
 	}
 }
 
-func IsContain(t *testing.T, s1 string, s2 string) {
-	if !strings.Contains(s1, s2) {
-		t.Error()
-	}
+func Test(t *testing.T) {
+	TestingT(t)
 }
 
-func TestError(t *testing.T) {
+var _ = Suite(&testErrorSuite{})
+
+type testErrorSuite struct{}
+
+func (s *testErrorSuite) TestError(c *C) {
 	conf := &log.Config{Level: "debug", File: log.FileLogConfig{}, DisableTimestamp: true}
 	lg := newZapTestLogger(conf)
 	log.ReplaceGlobals(lg.Logger, nil)
 
-	rfc := `[error="[PD:format:ErrFormatParseHistoryIndex] parse history index error"]`
-	log.Error(ErrFormatParseHistoryIndex.MessageTemplate(), zap.Error(ErrFormatParseHistoryIndex.FastGenByArgs()))
-	lg.Contain(t, rfc)
-	rfc = `[error="[PD:internal:ErrStoreNotFound] store id 1 not found"]`
-	log.Error(ErrStoreNotFound.MessageTemplate(), zap.Error(ErrStoreNotFound.FastGenByArgs(1)))
-	lg.Contain(t, rfc)
+	rfc := `[error="[PD:tso:ErrInvalidTimestamp] invalid timestamp"]`
+	log.Error("test", ZapError(ErrInvalidTimestamp))
+	c.Assert(strings.Contains(lg.Message(), rfc), IsTrue)
+	err := errors.New("test error")
+	log.Error("test", ZapError(ErrInvalidTimestamp, err))
+	rfc = `[error="[PD:tso:ErrInvalidTimestamp] test error"]`
+	fmt.Println(lg.Message())
+	c.Assert(strings.Contains(lg.Message(), rfc), IsTrue)
 }
diff --git a/pkg/etcdutil/etcdutil.go b/pkg/etcdutil/etcdutil.go
index fae03759052..94b7c18efcb 100644
--- a/pkg/etcdutil/etcdutil.go
+++ b/pkg/etcdutil/etcdutil.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,8 +20,9 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/errs"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/etcdserver"
 	"go.etcd.io/etcd/pkg/types"
@@ -61,7 +62,7 @@ func CheckClusterID(localClusterID types.ID, um types.URLsMap, tlsConfig *tls.Co
 		trp.CloseIdleConnections()
 		if gerr != nil {
 			// Do not return error, because other members may be not ready.
-			log.Error("failed to get cluster from remote", zap.Error(gerr))
+			log.Error("failed to get cluster from remote", errs.ZapError(errs.ErrGetCluster, gerr))
 			continue
 		}
 
@@ -105,7 +106,7 @@ func EtcdKVGet(c *clientv3.Client, key string, opts ...clientv3.OpOption) (*clie
 	start := time.Now()
 	resp, err := clientv3.NewKV(c).Get(ctx, key, opts...)
 	if err != nil {
-		log.Error("load from etcd meet error", zap.Error(err))
+		log.Error("load from etcd meet error", errs.ZapError(errs.ErrLoadValue, err))
 	}
 	if cost := time.Since(start); cost > DefaultSlowRequestTime {
 		log.Warn("kv gets too slow", zap.String("request-key", key), zap.Duration("cost", cost), zap.Error(err))
diff --git a/pkg/etcdutil/etcdutil_test.go b/pkg/etcdutil/etcdutil_test.go
index fdbd39011bf..f5b942d2267 100644
--- a/pkg/etcdutil/etcdutil_test.go
+++ b/pkg/etcdutil/etcdutil_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import (
 	"testing"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/pkg/tempurl"
+	"github.com/tikv/pd/pkg/tempurl"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/embed"
 	"go.etcd.io/etcd/pkg/types"
@@ -35,8 +35,7 @@ func Test(t *testing.T) {
 
 var _ = Suite(&testEtcdutilSuite{})
 
-type testEtcdutilSuite struct {
-}
+type testEtcdutilSuite struct{}
 
 func newTestSingleConfig() *embed.Config {
 	cfg := embed.NewConfig()
diff --git a/pkg/grpcutil/grpcutil.go b/pkg/grpcutil/grpcutil.go
index 5ba652958c8..72b96bc0021 100644
--- a/pkg/grpcutil/grpcutil.go
+++ b/pkg/grpcutil/grpcutil.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ import (
 	"crypto/tls"
 	"net/url"
 
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
 	"go.etcd.io/etcd/pkg/transport"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
diff --git a/pkg/keyutil/util.go b/pkg/keyutil/util.go
index aa00655ad2f..3c29a85fb06 100644
--- a/pkg/keyutil/util.go
+++ b/pkg/keyutil/util.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/keyutil/util_test.go b/pkg/keyutil/util_test.go
index 409ce722c08..14d7493fd6d 100644
--- a/pkg/keyutil/util_test.go
+++ b/pkg/keyutil/util_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/logutil/log.go b/pkg/logutil/log.go
index d1ee2058c0b..25e74a43ea5 100644
--- a/pkg/logutil/log.go
+++ b/pkg/logutil/log.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ import (
 	"sync"
 
 	"github.com/coreos/pkg/capnslog"
+	"github.com/pingcap/errors"
 	zaplog "github.com/pingcap/log"
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"go.etcd.io/etcd/raft"
 	"go.uber.org/zap"
diff --git a/pkg/logutil/log_test.go b/pkg/logutil/log_test.go
index 5d3db57ef60..205333c5b66 100644
--- a/pkg/logutil/log_test.go
+++ b/pkg/logutil/log_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -86,7 +86,7 @@ func (s *testLogSuite) TestLogging(c *C) {
 
 	log.SetOutput(s.buf)
 
-	tlog := capnslog.NewPackageLogger("github.com/pingcap/pd/v4/pkg/logutil", "test")
+	tlog := capnslog.NewPackageLogger("github.com/tikv/pd/pkg/logutil", "test")
 
 	tlog.Infof("[this message should not be sent to buf]")
 	c.Assert(s.buf.Len(), Equals, 0)
diff --git a/pkg/metricutil/metricutil.go b/pkg/metricutil/metricutil.go
index fc20b250401..a1e5d8e7846 100644
--- a/pkg/metricutil/metricutil.go
+++ b/pkg/metricutil/metricutil.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@ import (
 	"unicode"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/push"
-	"go.uber.org/zap"
+	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/typeutil"
 )
 
 const zeroDuration = time.Duration(0)
@@ -68,7 +68,7 @@ func prometheusPushClient(job, addr string, interval time.Duration) {
 	for {
 		err := pusher.Push()
 		if err != nil {
-			log.Error("could not push metrics to Prometheus Pushgateway", zap.Error(err))
+			log.Error("could not push metrics to Prometheus Pushgateway", errs.ZapError(errs.ErrPushGateway, err))
 		}
 
 		time.Sleep(interval)
diff --git a/pkg/metricutil/metricutil_test.go b/pkg/metricutil/metricutil_test.go
index 5772236d777..590c5b6f395 100644
--- a/pkg/metricutil/metricutil_test.go
+++ b/pkg/metricutil/metricutil_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ import (
 	"time"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
+	"github.com/tikv/pd/pkg/typeutil"
 )
 
 func Test(t *testing.T) {
diff --git a/pkg/mock/mockcluster/mockcluster.go b/pkg/mock/mockcluster/mockcluster.go
index 031044eecfb..46cad5aa089 100644
--- a/pkg/mock/mockcluster/mockcluster.go
+++ b/pkg/mock/mockcluster/mockcluster.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,13 +21,14 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/mock/mockid"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/kv"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
-	"github.com/pingcap/pd/v4/server/statistics"
+	"github.com/tikv/pd/pkg/mock/mockid"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/kv"
+	"github.com/tikv/pd/server/schedule/placement"
+	"github.com/tikv/pd/server/schedule/storelimit"
+	"github.com/tikv/pd/server/statistics"
+	"github.com/tikv/pd/server/versioninfo"
 	"go.uber.org/zap"
 )
 
@@ -39,7 +40,8 @@ type Cluster struct {
 	*placement.RuleManager
 	*statistics.HotCache
 	*statistics.StoresStats
-	ID uint64
+	ID             uint64
+	suspectRegions map[uint64]struct{}
 }
 
 // NewCluster creates a new Cluster
@@ -53,6 +55,7 @@ func NewCluster(opt *mockoption.ScheduleOptions) *Cluster {
 		RuleManager:     ruleManager,
 		HotCache:        statistics.NewHotCache(),
 		StoresStats:     statistics.NewStoresStats(),
+		suspectRegions:  map[uint64]struct{}{},
 	}
 }
 
@@ -617,8 +620,42 @@ func (mc *Cluster) MockRegionInfo(regionID uint64, leaderStoreID uint64,
 	}
 	for _, storeID := range learnerStoreIDs {
 		peer, _ := mc.AllocPeer(storeID)
-		peer.IsLearner = true
+		peer.Role = metapb.PeerRole_Learner
 		region.Peers = append(region.Peers, peer)
 	}
 	return core.NewRegionInfo(region, leader)
 }
+
+// SetStoreLabel set the labels to the target store
+func (mc *Cluster) SetStoreLabel(storeID uint64, labels map[string]string) {
+	store := mc.GetStore(storeID)
+	newLabels := make([]*metapb.StoreLabel, 0, len(labels))
+	for k, v := range labels {
+		newLabels = append(newLabels, &metapb.StoreLabel{Key: k, Value: v})
+	}
+	newStore := store.Clone(core.SetStoreLabels(newLabels))
+	mc.PutStore(newStore)
+}
+
+// IsFeatureSupported checks if the feature is supported by current cluster.
+func (mc *Cluster) IsFeatureSupported(versioninfo.Feature) bool {
+	return true
+}
+
+// AddSuspectRegions mock method
+func (mc *Cluster) AddSuspectRegions(ids ...uint64) {
+	for _, id := range ids {
+		mc.suspectRegions[id] = struct{}{}
+	}
+}
+
+// CheckRegionUnderSuspect only used for unit test
+func (mc *Cluster) CheckRegionUnderSuspect(id uint64) bool {
+	_, ok := mc.suspectRegions[id]
+	return ok
+}
+
+// ResetSuspectRegions only used for unit test
+func (mc *Cluster) ResetSuspectRegions() {
+	mc.suspectRegions = map[uint64]struct{}{}
+}
diff --git a/pkg/mock/mockhbstream/mockhbstream.go b/pkg/mock/mockhbstream/mockhbstream.go
index ce6d5ba3878..f234729e6bb 100644
--- a/pkg/mock/mockhbstream/mockhbstream.go
+++ b/pkg/mock/mockhbstream/mockhbstream.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"time"
 
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/opt"
 )
 
 // HeartbeatStream is used to mock HeartbeatStream for test use.
diff --git a/pkg/mock/mockid/mockid.go b/pkg/mock/mockid/mockid.go
index 6357bd9c2a7..e685459e81c 100644
--- a/pkg/mock/mockid/mockid.go
+++ b/pkg/mock/mockid/mockid.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/mock/mockoption/mockoption.go b/pkg/mock/mockoption/mockoption.go
index df2e692f2b4..3f21c1cf0d5 100644
--- a/pkg/mock/mockoption/mockoption.go
+++ b/pkg/mock/mockoption/mockoption.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ import (
 	"time"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/storelimit"
 )
 
 const (
diff --git a/pkg/slice/slice.go b/pkg/slice/slice.go
index 0e6f00fc0c9..afd8c52d0d2 100644
--- a/pkg/slice/slice.go
+++ b/pkg/slice/slice.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/slice/slice_test.go b/pkg/slice/slice_test.go
index 989194fc6ed..ee6ebc09f82 100644
--- a/pkg/slice/slice_test.go
+++ b/pkg/slice/slice_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ import (
 	"testing"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/pkg/slice"
+	"github.com/tikv/pd/pkg/slice"
 )
 
 func Test(t *testing.T) {
diff --git a/pkg/swaggerserver/empty_handler.go b/pkg/swaggerserver/empty_handler.go
index 6e688281596..0f86660c0d2 100644
--- a/pkg/swaggerserver/empty_handler.go
+++ b/pkg/swaggerserver/empty_handler.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/swaggerserver/swagger_handler.go b/pkg/swaggerserver/swagger_handler.go
index 7f059af0898..bf1252834f1 100644
--- a/pkg/swaggerserver/swagger_handler.go
+++ b/pkg/swaggerserver/swagger_handler.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ package swaggerserver
 import (
 	"net/http"
 
-	_ "github.com/pingcap/pd/v4/docs/swagger" // nolint: swagger docs
 	httpSwagger "github.com/swaggo/http-swagger"
+	_ "github.com/tikv/pd/docs/swagger" // nolint: swagger docs
 )
 
 func handler() http.Handler {
diff --git a/pkg/swaggerserver/swaggerserver.go b/pkg/swaggerserver/swaggerserver.go
index 3ee168e8568..446afca0514 100644
--- a/pkg/swaggerserver/swaggerserver.go
+++ b/pkg/swaggerserver/swaggerserver.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@ package swaggerserver
 
 import (
 	"context"
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/server"
 	"net/http"
 )
 
diff --git a/pkg/tempurl/tempurl.go b/pkg/tempurl/tempurl.go
index 41dc1d9c620..3aaeaafcea3 100644
--- a/pkg/tempurl/tempurl.go
+++ b/pkg/tempurl/tempurl.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/testutil/leak.go b/pkg/testutil/leak.go
index 6a4fc0b29f0..2579d96271f 100644
--- a/pkg/testutil/leak.go
+++ b/pkg/testutil/leak.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/testutil/operator_check.go b/pkg/testutil/operator_check.go
index c60dbb7429d..e3ac88d034d 100644
--- a/pkg/testutil/operator_check.go
+++ b/pkg/testutil/operator_check.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@ package testutil
 
 import (
 	check "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/operator"
 )
 
 // CheckAddPeer checks if the operator is to add peer on specified store.
diff --git a/pkg/testutil/testutil.go b/pkg/testutil/testutil.go
index 15c4bb7e046..3663285fabe 100644
--- a/pkg/testutil/testutil.go
+++ b/pkg/testutil/testutil.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/tsoutil/tso.go b/pkg/tsoutil/tso.go
index 2ab31cc1f76..b1c3b638769 100644
--- a/pkg/tsoutil/tso.go
+++ b/pkg/tsoutil/tso.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,7 +13,11 @@
 
 package tsoutil
 
-import "time"
+import (
+	"time"
+
+	"github.com/pingcap/kvproto/pkg/pdpb"
+)
 
 const (
 	physicalShiftBits = 18
@@ -27,3 +31,11 @@ func ParseTS(ts uint64) (time.Time, uint64) {
 	physicalTime := time.Unix(int64(physical/1000), int64(physical)%1000*time.Millisecond.Nanoseconds())
 	return physicalTime, logical
 }
+
+// ParseTimestamp parses pdpb.Timestamp to time.Time
+func ParseTimestamp(ts pdpb.Timestamp) (time.Time, uint64) {
+	logical := uint64(ts.Logical)
+	physical := ts.Physical
+	physicalTime := time.Unix(int64(physical/1000), int64(physical)%1000*time.Millisecond.Nanoseconds())
+	return physicalTime, logical
+}
diff --git a/pkg/typeutil/comparison.go b/pkg/typeutil/comparison.go
new file mode 100644
index 00000000000..3f10fe51593
--- /dev/null
+++ b/pkg/typeutil/comparison.go
@@ -0,0 +1,40 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package typeutil
+
+import "time"
+
+// MinUint64 returns the min value between two variables whose type are uint64.
+func MinUint64(a, b uint64) uint64 {
+	if a < b {
+		return a
+	}
+	return b
+}
+
+// MaxUint64 returns the max value between two variables whose type are uint64.
+func MaxUint64(a, b uint64) uint64 {
+	if a > b {
+		return a
+	}
+	return b
+}
+
+// MinDuration returns the min value between two variables whose type are time.Duration.
+func MinDuration(a, b time.Duration) time.Duration {
+	if a < b {
+		return a
+	}
+	return b
+}
diff --git a/server/schedulers/utils_test.go b/pkg/typeutil/comparison_test.go
similarity index 57%
rename from server/schedulers/utils_test.go
rename to pkg/typeutil/comparison_test.go
index 3db2ee023fb..47a89a07426 100644
--- a/server/schedulers/utils_test.go
+++ b/pkg/typeutil/comparison_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package schedulers
+package typeutil
 
 import (
 	"testing"
@@ -20,12 +20,7 @@ import (
 	. "github.com/pingcap/check"
 )
 
-const (
-	KB = 1024
-	MB = 1024 * KB
-)
-
-func TestSchedulers(t *testing.T) {
+func TestComparison(t *testing.T) {
 	TestingT(t)
 }
 
@@ -34,19 +29,19 @@ var _ = Suite(&testMinMaxSuite{})
 type testMinMaxSuite struct{}
 
 func (s *testMinMaxSuite) TestMinUint64(c *C) {
-	c.Assert(minUint64(1, 2), Equals, uint64(1))
-	c.Assert(minUint64(2, 1), Equals, uint64(1))
-	c.Assert(minUint64(1, 1), Equals, uint64(1))
+	c.Assert(MinUint64(1, 2), Equals, uint64(1))
+	c.Assert(MinUint64(2, 1), Equals, uint64(1))
+	c.Assert(MinUint64(1, 1), Equals, uint64(1))
 }
 
 func (s *testMinMaxSuite) TestMaxUint64(c *C) {
-	c.Assert(maxUint64(1, 2), Equals, uint64(2))
-	c.Assert(maxUint64(2, 1), Equals, uint64(2))
-	c.Assert(maxUint64(1, 1), Equals, uint64(1))
+	c.Assert(MaxUint64(1, 2), Equals, uint64(2))
+	c.Assert(MaxUint64(2, 1), Equals, uint64(2))
+	c.Assert(MaxUint64(1, 1), Equals, uint64(1))
 }
 
 func (s *testMinMaxSuite) TestMinDuration(c *C) {
-	c.Assert(minDuration(time.Minute, time.Second), Equals, time.Second)
-	c.Assert(minDuration(time.Second, time.Minute), Equals, time.Second)
-	c.Assert(minDuration(time.Second, time.Second), Equals, time.Second)
+	c.Assert(MinDuration(time.Minute, time.Second), Equals, time.Second)
+	c.Assert(MinDuration(time.Second, time.Minute), Equals, time.Second)
+	c.Assert(MinDuration(time.Second, time.Second), Equals, time.Second)
 }
diff --git a/pkg/typeutil/convension.go b/pkg/typeutil/convension.go
index 80bb7b0996c..df869bbc9e4 100644
--- a/pkg/typeutil/convension.go
+++ b/pkg/typeutil/convension.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ package typeutil
 import (
 	"encoding/binary"
 
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
 )
 
 // BytesToUint64 converts a byte slice to uint64.
diff --git a/pkg/typeutil/duration.go b/pkg/typeutil/duration.go
index f69aca02196..15ed30af963 100644
--- a/pkg/typeutil/duration.go
+++ b/pkg/typeutil/duration.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
 )
 
 // Duration is a wrapper of time.Duration for TOML and JSON.
diff --git a/pkg/typeutil/duration_test.go b/pkg/typeutil/duration_test.go
index 3772d3fe60a..9418b549f04 100644
--- a/pkg/typeutil/duration_test.go
+++ b/pkg/typeutil/duration_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/typeutil/size.go b/pkg/typeutil/size.go
index efbc52dba9b..e3cc12bf3e4 100644
--- a/pkg/typeutil/size.go
+++ b/pkg/typeutil/size.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ import (
 	"strconv"
 
 	"github.com/docker/go-units"
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
 )
 
 // ByteSize is a retype uint64 for TOML and JSON.
diff --git a/pkg/typeutil/size_test.go b/pkg/typeutil/size_test.go
index 54be8893bf1..9ab19265e1a 100644
--- a/pkg/typeutil/size_test.go
+++ b/pkg/typeutil/size_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/typeutil/string_slice.go b/pkg/typeutil/string_slice.go
index 6b23aeddf89..7da4259db65 100644
--- a/pkg/typeutil/string_slice.go
+++ b/pkg/typeutil/string_slice.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
 )
 
 // StringSlice is more friendly to json encode/decode
diff --git a/pkg/typeutil/string_slice_test.go b/pkg/typeutil/string_slice_test.go
index 9e3f8c7bd98..d46c88ae931 100644
--- a/pkg/typeutil/string_slice_test.go
+++ b/pkg/typeutil/string_slice_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/typeutil/time.go b/pkg/typeutil/time.go
index e9e9631abd7..1652d0cbbfa 100644
--- a/pkg/typeutil/time.go
+++ b/pkg/typeutil/time.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/typeutil/time_test.go b/pkg/typeutil/time_test.go
index a8a8c7def19..8a8800f54cb 100644
--- a/pkg/typeutil/time_test.go
+++ b/pkg/typeutil/time_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/plugin/scheduler_example/evict_leader.go b/plugin/scheduler_example/evict_leader.go
index d72d7243cc2..e17b08c794e 100644
--- a/plugin/scheduler_example/evict_leader.go
+++ b/plugin/scheduler_example/evict_leader.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,15 +20,15 @@ import (
 	"sync"
 
 	"github.com/gorilla/mux"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedulers"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedulers"
 	"github.com/unrolled/render"
 	"go.uber.org/zap"
 )
@@ -131,8 +131,7 @@ func (conf *evictLeaderSchedulerConfig) Persist() error {
 	if err != nil {
 		return err
 	}
-	conf.storage.SaveScheduleConfig(name, data)
-	return nil
+	return conf.storage.SaveScheduleConfig(name, data)
 }
 
 func (conf *evictLeaderSchedulerConfig) getScheduleName() string {
diff --git a/server/api/admin.go b/server/api/admin.go
index 238367618e6..0a13f57a1c7 100644
--- a/server/api/admin.go
+++ b/server/api/admin.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ import (
 	"strconv"
 
 	"github.com/gorilla/mux"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/admin_test.go b/server/api/admin_test.go
index b85fcdbf6de..94edc528745 100644
--- a/server/api/admin_test.go
+++ b/server/api/admin_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/core"
 )
 
 var _ = Suite(&testAdminSuite{})
diff --git a/server/api/cluster.go b/server/api/cluster.go
index 59058b1d990..6bdb157ba79 100644
--- a/server/api/cluster.go
+++ b/server/api/cluster.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ package api
 import (
 	"net/http"
 
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/cluster_test.go b/server/api/cluster_test.go
index cd9300ac0f0..9195964f71b 100644
--- a/server/api/cluster_test.go
+++ b/server/api/cluster_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/cluster"
-	"github.com/pingcap/pd/v4/server/config"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/cluster"
+	"github.com/tikv/pd/server/config"
 )
 
 var _ = Suite(&testClusterSuite{})
diff --git a/server/api/component.go b/server/api/component.go
index aeab9accf6a..e03af710914 100644
--- a/server/api/component.go
+++ b/server/api/component.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
 package api
 
 import (
+	"errors"
 	"net/http"
 
 	"github.com/gorilla/mux"
 	"github.com/pingcap/errcode"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/component_test.go b/server/api/component_test.go
index 21096ce4472..9447b7c559a 100644
--- a/server/api/component_test.go
+++ b/server/api/component_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ import (
 	"strings"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
 )
 
 var _ = Suite(&testComponentSuite{})
diff --git a/server/api/config.go b/server/api/config.go
index 8b612fa3016..597e64d9783 100644
--- a/server/api/config.go
+++ b/server/api/config.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,12 +23,12 @@ import (
 	"strings"
 
 	"github.com/pingcap/errcode"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/pkg/logutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/pkg/logutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/config_test.go b/server/api/config_test.go
index b339bda04b6..80f5ad7ec3a 100644
--- a/server/api/config_test.go
+++ b/server/api/config_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,10 +20,10 @@ import (
 	"time"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/cluster"
-	"github.com/pingcap/pd/v4/server/config"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/versioninfo"
 )
 
 var _ = Suite(&testConfigSuite{})
@@ -107,7 +107,7 @@ func (s *testConfigSuite) TestConfigAll(c *C) {
 	cfg.Log.Level = "warn"
 	cfg.ReplicationMode.DRAutoSync.LabelKey = "foobar"
 	cfg.ReplicationMode.ReplicationMode = "dr-auto-sync"
-	v, err := cluster.ParseVersion("v4.0.0-beta")
+	v, err := versioninfo.ParseVersion("v4.0.0-beta")
 	c.Assert(err, IsNil)
 	cfg.ClusterVersion = *v
 	c.Assert(newCfg1, DeepEquals, cfg)
diff --git a/server/api/context.go b/server/api/context.go
index 95f47aa4765..dacd57f8e45 100644
--- a/server/api/context.go
+++ b/server/api/context.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ package api
 import (
 	"context"
 
-	"github.com/pingcap/pd/v4/server/cluster"
+	"github.com/tikv/pd/server/cluster"
 )
 
 type contextKey int
diff --git a/server/api/diagnose.go b/server/api/diagnose.go
index 26041095f5a..fb16890d92b 100644
--- a/server/api/diagnose.go
+++ b/server/api/diagnose.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/diagnose_test.go b/server/api/diagnose_test.go
index 2a09c454a6a..6f528a1090a 100644
--- a/server/api/diagnose_test.go
+++ b/server/api/diagnose_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ import (
 	"io/ioutil"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/server"
 )
 
 var _ = Suite(&testDiagnoseAPISuite{})
diff --git a/server/api/etcd_api_test.go b/server/api/etcd_api_test.go
index 4603f15ec63..7e6ffad7706 100644
--- a/server/api/etcd_api_test.go
+++ b/server/api/etcd_api_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/api/health.go b/server/api/health.go
index bb7e78aa88a..0afdbd70d4e 100644
--- a/server/api/health.go
+++ b/server/api/health.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@ package api
 import (
 	"net/http"
 
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/cluster"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/cluster"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/health_test.go b/server/api/health_test.go
index 7c6c58ba578..f5e8efb7300 100644
--- a/server/api/health_test.go
+++ b/server/api/health_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ import (
 	"strings"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
 )
 
 var _ = Suite(&testHealthAPISuite{})
diff --git a/server/api/hot_status.go b/server/api/hot_status.go
index 0f87b1b14c1..f7de983f40c 100644
--- a/server/api/hot_status.go
+++ b/server/api/hot_status.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ package api
 import (
 	"net/http"
 
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/hot_status_test.go b/server/api/hot_status_test.go
index ab26e301b3c..b17c020fcc5 100644
--- a/server/api/hot_status_test.go
+++ b/server/api/hot_status_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ import (
 	"fmt"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/server"
-	_ "github.com/pingcap/pd/v4/server/schedulers"
+	"github.com/tikv/pd/server"
+	_ "github.com/tikv/pd/server/schedulers"
 )
 
 var _ = Suite(&testHotStatusSuite{})
diff --git a/server/api/label.go b/server/api/label.go
index bb6a6d8e920..6aab86edd3f 100644
--- a/server/api/label.go
+++ b/server/api/label.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/label_test.go b/server/api/label_test.go
index 28a4f068b8c..3ce5c08ba18 100644
--- a/server/api/label_test.go
+++ b/server/api/label_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
 )
 
 var _ = Suite(&testLabelsStoreSuite{})
diff --git a/server/api/log.go b/server/api/log.go
index e2e909f4140..16d3edcc763 100644
--- a/server/api/log.go
+++ b/server/api/log.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ import (
 	"net/http"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/logutil"
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/pkg/logutil"
+	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/log_test.go b/server/api/log_test.go
index 90663c2f6a5..638b634aa20 100644
--- a/server/api/log_test.go
+++ b/server/api/log_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/server"
 )
 
 var _ = Suite(&testLogSuite{})
diff --git a/server/api/member.go b/server/api/member.go
index bb41af7b19a..ec2a2c34c19 100644
--- a/server/api/member.go
+++ b/server/api/member.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,12 +20,12 @@ import (
 	"strconv"
 
 	"github.com/gorilla/mux"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 	"go.uber.org/zap"
 )
@@ -249,13 +249,13 @@ func (h *leaderHandler) Get(w http.ResponseWriter, r *http.Request) {
 }
 
 // @Tags leader
-// @Summary Transfer leadership to another PD server.
+// @Summary Transfer etcd leadership to another PD server.
 // @Produce json
 // @Success 200 {string} string "The transfer command is submitted."
 // @Failure 500 {string} string "PD server failed to proceed the request."
 // @Router /leader/resign [post]
 func (h *leaderHandler) Resign(w http.ResponseWriter, r *http.Request) {
-	err := h.svr.GetMember().ResignLeader(h.svr.Context(), h.svr.Name(), "")
+	err := h.svr.GetMember().ResignEtcdLeader(h.svr.Context(), h.svr.Name(), "")
 	if err != nil {
 		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
 		return
@@ -265,14 +265,14 @@ func (h *leaderHandler) Resign(w http.ResponseWriter, r *http.Request) {
 }
 
 // @Tags leader
-// @Summary Transfer leadership to the specific PD server.
+// @Summary Transfer etcd leadership to the specific PD server.
 // @Param nextLeader path string true "PD server that transfer leader to"
 // @Produce json
 // @Success 200 {string} string "The transfer command is submitted."
 // @Failure 500 {string} string "PD server failed to proceed the request."
 // @Router /leader/transfer/{nextLeader} [post]
 func (h *leaderHandler) Transfer(w http.ResponseWriter, r *http.Request) {
-	err := h.svr.GetMember().ResignLeader(h.svr.Context(), h.svr.Name(), mux.Vars(r)["next_leader"])
+	err := h.svr.GetMember().ResignEtcdLeader(h.svr.Context(), h.svr.Name(), mux.Vars(r)["next_leader"])
 	if err != nil {
 		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
 		return
diff --git a/server/api/member_test.go b/server/api/member_test.go
index 61497c32f50..fa9560a8e54 100644
--- a/server/api/member_test.go
+++ b/server/api/member_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
 )
 
 var _ = Suite(&testMemberAPISuite{})
diff --git a/server/api/metric.go b/server/api/metric.go
index d07e1001fe9..1719d12a19b 100644
--- a/server/api/metric.go
+++ b/server/api/metric.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/pingcap/pd/v4/pkg/apiutil/serverapi"
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/pkg/apiutil/serverapi"
+	"github.com/tikv/pd/server"
 )
 
 type queryMetric struct {
diff --git a/server/api/middleware.go b/server/api/middleware.go
index 0d47750fb9d..ceab32a59f3 100644
--- a/server/api/middleware.go
+++ b/server/api/middleware.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@ package api
 import (
 	"net/http"
 
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/cluster"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/cluster"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/operator.go b/server/api/operator.go
index 91d222130f0..ce96288a92d 100644
--- a/server/api/operator.go
+++ b/server/api/operator.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@ import (
 	"strconv"
 
 	"github.com/gorilla/mux"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/schedule/operator"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/operator_test.go b/server/api/operator_test.go
index d41f5a452d9..f265dc8df8f 100644
--- a/server/api/operator_test.go
+++ b/server/api/operator_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,10 +23,10 @@ import (
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/cluster"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/versioninfo"
 )
 
 var _ = Suite(&testOperatorSuite{})
@@ -38,7 +38,7 @@ type testOperatorSuite struct {
 }
 
 func (s *testOperatorSuite) SetUpSuite(c *C) {
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/schedule/unexpectedOperator", "return(true)"), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/schedule/unexpectedOperator", "return(true)"), IsNil)
 	s.svr, s.cleanup = mustNewServer(c, func(cfg *config.Config) { cfg.Replication.MaxReplicas = 1 })
 	mustWaitLeader(c, []*server.Server{s.svr})
 
@@ -143,7 +143,7 @@ func mustPutStore(c *C, svr *server.Server, id uint64, state metapb.StoreState,
 			Address: fmt.Sprintf("tikv%d", id),
 			State:   state,
 			Labels:  labels,
-			Version: (*cluster.MinSupportedVersion(cluster.Version2_0)).String(),
+			Version: versioninfo.MinSupportedVersion(versioninfo.Version2_0).String(),
 		},
 	})
 	c.Assert(err, IsNil)
diff --git a/server/api/plugin.go b/server/api/plugin.go
index b1ae37eda08..a469aa1a580 100644
--- a/server/api/plugin.go
+++ b/server/api/plugin.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/cluster"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/cluster"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/region.go b/server/api/region.go
index 06565c9bd46..81b5c643c02 100644
--- a/server/api/region.go
+++ b/server/api/region.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,9 +26,9 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/kvproto/pkg/replication_modepb"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/core"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/region_test.go b/server/api/region_test.go
index cc6833877c5..1b414c946f1 100644
--- a/server/api/region_test.go
+++ b/server/api/region_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/core"
 )
 
 var _ = Suite(&testRegionSuite{})
diff --git a/server/api/replication_mode.go b/server/api/replication_mode.go
index 134b91aac0c..ddceceb0c6b 100644
--- a/server/api/replication_mode.go
+++ b/server/api/replication_mode.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ package api
 import (
 	"net/http"
 
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/router.go b/server/api/router.go
index c13fc712490..9d63f848e77 100644
--- a/server/api/router.go
+++ b/server/api/router.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import (
 	"net/http/pprof"
 
 	"github.com/gorilla/mux"
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 )
 
@@ -40,7 +40,7 @@ func createIndentRender() *render.Render {
 // @version 1.0
 // @description This is placement driver.
 // @contact.name Placement Driver Support
-// @contact.url https://github.com/pingcap/pd/issues
+// @contact.url https://github.com/tikv/pd/issues
 // @contact.email info@pingcap.com
 // @license.name Apache 2.0
 // @license.url http://www.apache.org/licenses/LICENSE-2.0.html
@@ -100,6 +100,11 @@ func createRouter(ctx context.Context, prefix string, svr *server.Server) *mux.R
 	clusterRouter.HandleFunc("/config/rule", rulesHandler.Set).Methods("POST")
 	clusterRouter.HandleFunc("/config/rule/{group}/{id}", rulesHandler.Delete).Methods("DELETE")
 
+	clusterRouter.HandleFunc("/config/rule_group/{id}", rulesHandler.GetGroupConfig).Methods("GET")
+	clusterRouter.HandleFunc("/config/rule_group", rulesHandler.SetGroupConfig).Methods("POST")
+	clusterRouter.HandleFunc("/config/rule_group/{id}", rulesHandler.DeleteGroupConfig).Methods("DELETE")
+	clusterRouter.HandleFunc("/config/rule_groups", rulesHandler.GetAllGroupConfigs).Methods("GET")
+
 	storeHandler := newStoreHandler(handler, rd)
 	clusterRouter.HandleFunc("/store/{id}", storeHandler.Get).Methods("GET")
 	clusterRouter.HandleFunc("/store/{id}", storeHandler.Delete).Methods("DELETE")
@@ -208,6 +213,11 @@ func createRouter(ctx context.Context, prefix string, svr *server.Server) *mux.R
 	apiRouter.Handle("/debug/pprof/block", pprof.Handler("block"))
 	apiRouter.Handle("/debug/pprof/goroutine", pprof.Handler("goroutine"))
 
+	// service GC safepoint API
+	serviceGCSafepointHandler := newServiceGCSafepointHandler(svr, rd)
+	apiRouter.HandleFunc("/gc/safepoint", serviceGCSafepointHandler.List).Methods("GET")
+	apiRouter.HandleFunc("/gc/safepoint/{service_id}", serviceGCSafepointHandler.Delete).Methods("DELETE")
+
 	// Deprecated
 	rootRouter.Handle("/health", newHealthHandler(svr, rd)).Methods("GET")
 	// Deprecated
diff --git a/server/api/rule.go b/server/api/rule.go
index cceb868201f..0a98b8cc802 100644
--- a/server/api/rule.go
+++ b/server/api/rule.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,13 +20,12 @@ import (
 	"strconv"
 
 	"github.com/gorilla/mux"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/pkg/codec"
-	"github.com/pingcap/pd/v4/pkg/keyutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/pkg/codec"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/placement"
 	"github.com/unrolled/render"
 )
 
@@ -217,16 +216,9 @@ func (h *ruleHandler) Set(w http.ResponseWriter, r *http.Request) {
 		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	newSuspectKeyRange := [2][]byte{
-		rule.StartKey,
-		rule.EndKey,
-	}
-	cluster.AddSuspectKeyRange(keyutil.BuildKeyRangeKey(rule.StartKey, rule.EndKey), newSuspectKeyRange)
+	cluster.AddSuspectKeyRange(rule.StartKey, rule.EndKey)
 	if oldRule != nil {
-		cluster.AddSuspectKeyRange(keyutil.BuildKeyRangeKey(oldRule.StartKey, oldRule.EndKey), [2][]byte{
-			oldRule.StartKey,
-			oldRule.EndKey,
-		})
+		cluster.AddSuspectKeyRange(oldRule.StartKey, oldRule.EndKey)
 	}
 	h.rd.JSON(w, http.StatusOK, "Update rule successfully.")
 }
@@ -283,11 +275,7 @@ func (h *ruleHandler) Delete(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if rule != nil {
-		suspectKeyRanges := [2][]byte{
-			rule.StartKey,
-			rule.EndKey,
-		}
-		cluster.AddSuspectKeyRange(keyutil.BuildKeyRangeKey(rule.StartKey, rule.EndKey), suspectKeyRanges)
+		cluster.AddSuspectKeyRange(rule.StartKey, rule.EndKey)
 	}
 
 	h.rd.JSON(w, http.StatusOK, "Delete rule successfully.")
@@ -327,3 +315,98 @@ func (h *ruleHandler) Batch(w http.ResponseWriter, r *http.Request) {
 	}
 	h.rd.JSON(w, http.StatusOK, "Batch operations successfully.")
 }
+
+// @Tags rule
+// @Summary Get rule group config by group id.
+// @Param id path string true "Group Id"
+// @Produce json
+// @Success 200 {object} placement.RuleGroup
+// @Failure 404 {string} string "The RuleGroup does not exist."
+// @Failure 412 {string} string "Placement rules feature is disabled."
+// @Router /config/rule_group/{id} [get]
+func (h *ruleHandler) GetGroupConfig(w http.ResponseWriter, r *http.Request) {
+	cluster := getCluster(r.Context())
+	if !cluster.IsPlacementRulesEnabled() {
+		h.rd.JSON(w, http.StatusPreconditionFailed, errPlacementDisabled.Error())
+		return
+	}
+	id := mux.Vars(r)["id"]
+	group := cluster.GetRuleManager().GetRuleGroup(id)
+	if group == nil {
+		h.rd.JSON(w, http.StatusNotFound, nil)
+		return
+	}
+	h.rd.JSON(w, http.StatusOK, group)
+}
+
+// @Tags rule
+// @Summary Update rule group config.
+// @Accept json
+// @Param rule body placement.RuleGroup true "Parameters of rule group"
+// @Produce json
+// @Success 200 {string} string "Update rule group config successfully."
+// @Failure 400 {string} string "The input is invalid."
+// @Failure 412 {string} string "Placement rules feature is disabled."
+// @Failure 500 {string} string "PD server failed to proceed the request."
+// @Router /config/rule_group [post]
+func (h *ruleHandler) SetGroupConfig(w http.ResponseWriter, r *http.Request) {
+	cluster := getCluster(r.Context())
+	if !cluster.IsPlacementRulesEnabled() {
+		h.rd.JSON(w, http.StatusPreconditionFailed, errPlacementDisabled.Error())
+		return
+	}
+	var ruleGroup placement.RuleGroup
+	if err := apiutil.ReadJSONRespondError(h.rd, w, r.Body, &ruleGroup); err != nil {
+		return
+	}
+	if err := cluster.GetRuleManager().SetRuleGroup(&ruleGroup); err != nil {
+		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
+		return
+	}
+	for _, r := range cluster.GetRuleManager().GetRulesByGroup(ruleGroup.ID) {
+		cluster.AddSuspectKeyRange(r.StartKey, r.EndKey)
+	}
+	h.rd.JSON(w, http.StatusOK, "Update rule group successfully.")
+}
+
+// @Tags rule
+// @Summary Delete rule group config.
+// @Param id path string true "Group Id"
+// @Produce json
+// @Success 200 {string} string "Delete rule group config successfully."
+// @Failure 412 {string} string "Placement rules feature is disabled."
+// @Failure 500 {string} string "PD server failed to proceed the request."
+// @Router /config/rule_group/{id} [delete]
+func (h *ruleHandler) DeleteGroupConfig(w http.ResponseWriter, r *http.Request) {
+	cluster := getCluster(r.Context())
+	if !cluster.IsPlacementRulesEnabled() {
+		h.rd.JSON(w, http.StatusPreconditionFailed, errPlacementDisabled.Error())
+		return
+	}
+	id := mux.Vars(r)["id"]
+	err := cluster.GetRuleManager().DeleteRuleGroup(id)
+	if err != nil {
+		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
+		return
+	}
+	for _, r := range cluster.GetRuleManager().GetRulesByGroup(id) {
+		cluster.AddSuspectKeyRange(r.StartKey, r.EndKey)
+	}
+	h.rd.JSON(w, http.StatusOK, "Delete rule group successfully.")
+}
+
+// @Tags rule
+// @Summary List all rule group configs.
+// @Produce json
+// @Success 200 {array} placement.RuleGroup
+// @Failure 412 {string} string "Placement rules feature is disabled."
+// @Router /config/rule_groups [get]
+func (h *ruleHandler) GetAllGroupConfigs(w http.ResponseWriter, r *http.Request) {
+	cluster := getCluster(r.Context())
+	if !cluster.IsPlacementRulesEnabled() {
+		h.rd.JSON(w, http.StatusPreconditionFailed, errPlacementDisabled.Error())
+		return
+	}
+	ruleGroups := cluster.GetRuleManager().GetRuleGroups()
+	h.rd.JSON(w, http.StatusOK, ruleGroups)
+}
diff --git a/server/api/rule_test.go b/server/api/rule_test.go
index 405cee70b29..32f86a45ec5 100644
--- a/server/api/rule_test.go
+++ b/server/api/rule_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import (
 	"strings"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/schedule/placement"
 )
 
 var _ = Suite(&testRuleSuite{})
@@ -128,7 +128,7 @@ func (s *testRuleSuite) TestSet(c *C) {
 			name:    "Set Rule Failed",
 			rawData: setErrData,
 			success: false,
-			response: `"invalid count -1"
+			response: `"[PD:placement:ErrRuleContent] invalid rule content, invalid count -1"
 `,
 		},
 	}
@@ -143,7 +143,7 @@ func (s *testRuleSuite) TestSet(c *C) {
 
 			popKeyRangeMap := map[string]struct{}{}
 			for i := 0; i < len(testcase.popKeyRange)/2; i++ {
-				_, v, got := s.svr.GetRaftCluster().PopOneSuspectKeyRange()
+				v, got := s.svr.GetRaftCluster().PopOneSuspectKeyRange()
 				c.Assert(got, Equals, true)
 				popKeyRangeMap[hex.EncodeToString(v[0])] = struct{}{}
 				popKeyRangeMap[hex.EncodeToString(v[1])] = struct{}{}
@@ -266,7 +266,7 @@ func (s *testRuleSuite) TestSetAll(c *C) {
 			name:    "Set Rule Failed",
 			rawData: setErrData,
 			success: false,
-			response: `"invalid count -1"
+			response: `"[PD:placement:ErrRuleContent] invalid rule content, invalid count -1"
 `,
 		},
 	}
@@ -474,7 +474,7 @@ func (s *testRuleSuite) TestDelete(c *C) {
 		if len(testcase.popKeyRange) > 0 {
 			popKeyRangeMap := map[string]struct{}{}
 			for i := 0; i < len(testcase.popKeyRange)/2; i++ {
-				_, v, got := s.svr.GetRaftCluster().PopOneSuspectKeyRange()
+				v, got := s.svr.GetRaftCluster().PopOneSuspectKeyRange()
 				c.Assert(got, Equals, true)
 				popKeyRangeMap[hex.EncodeToString(v[0])] = struct{}{}
 				popKeyRangeMap[hex.EncodeToString(v[1])] = struct{}{}
@@ -599,7 +599,7 @@ func (s *testRuleSuite) TestBatch(c *C) {
 			name:    "Set Rule Failed",
 			rawData: setErrData,
 			success: false,
-			response: `"invalid count -1"
+			response: `"[PD:placement:ErrRuleContent] invalid rule content, invalid count -1"
 `,
 		},
 	}
diff --git a/server/api/scheduler.go b/server/api/scheduler.go
index ac87f94c9e9..b3d8ee784b4 100644
--- a/server/api/scheduler.go
+++ b/server/api/scheduler.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/schedulers"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/schedulers"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/scheduler_test.go b/server/api/scheduler_test.go
index fc386c7b032..e4e98ca4bd2 100644
--- a/server/api/scheduler_test.go
+++ b/server/api/scheduler_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server"
-	_ "github.com/pingcap/pd/v4/server/schedulers"
+	"github.com/tikv/pd/server"
+	_ "github.com/tikv/pd/server/schedulers"
 )
 
 var _ = Suite(&testScheduleSuite{})
diff --git a/server/api/server.go b/server/api/server.go
index 544b46c7e01..c97fea2da13 100644
--- a/server/api/server.go
+++ b/server/api/server.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/pingcap/pd/v4/pkg/apiutil/serverapi"
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/pkg/apiutil/serverapi"
+	"github.com/tikv/pd/server"
 	"github.com/urfave/negroni"
 )
 
diff --git a/server/api/server_test.go b/server/api/server_test.go
index f20b7f99d42..03cb1e36d0f 100644
--- a/server/api/server_test.go
+++ b/server/api/server_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
 	"go.uber.org/goleak"
 )
 
diff --git a/server/api/service_gc_safepoint.go b/server/api/service_gc_safepoint.go
new file mode 100644
index 00000000000..6d6539ead45
--- /dev/null
+++ b/server/api/service_gc_safepoint.go
@@ -0,0 +1,84 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package api
+
+import (
+	"net/http"
+
+	"github.com/gorilla/mux"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/core"
+	"github.com/unrolled/render"
+)
+
+type serviceGCSafepointHandler struct {
+	svr *server.Server
+	rd  *render.Render
+}
+
+func newServiceGCSafepointHandler(svr *server.Server, rd *render.Render) *serviceGCSafepointHandler {
+	return &serviceGCSafepointHandler{
+		svr: svr,
+		rd:  rd,
+	}
+}
+
+type listServiceGCSafepoint struct {
+	ServiceGCSafepoints []*core.ServiceSafePoint `json:"service_gc_safe_points"`
+	GCSafePoint         uint64                   `json:"gc_safe_point"`
+}
+
+// @Tags servicegcsafepoint
+// @Summary Get all service GC safepoint.
+// @Produce json
+// @Success 200 {array} listServiceGCSafepoint
+// @Failure 500 {string} string "PD server failed to proceed the request."
+// @Router /gc/safepoint [get]
+func (h *serviceGCSafepointHandler) List(w http.ResponseWriter, r *http.Request) {
+	storage := h.svr.GetStorage()
+	gcSafepoint, err := storage.LoadGCSafePoint()
+	if err != nil {
+		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
+		return
+	}
+	ssps, err := storage.GetAllServiceGCSafePoints()
+	if err != nil {
+		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
+		return
+	}
+	list := listServiceGCSafepoint{
+		GCSafePoint:         gcSafepoint,
+		ServiceGCSafepoints: ssps,
+	}
+	h.rd.JSON(w, http.StatusOK, list)
+}
+
+// @Tags servicegcsafepoint
+// @Summary Delete a service GC safepoint.
+// @Param service_id path string true "Service ID"
+// @Produce json
+// @Success 200 {string} string "Delete service GC safepoint successfully."
+// @Failure 500 {string} string "PD server failed to proceed the request."
+// @Router /gc/safepoint/{service_id} [delete]
+// @Tags rule
+func (h *serviceGCSafepointHandler) Delete(w http.ResponseWriter, r *http.Request) {
+	storage := h.svr.GetStorage()
+	serviceID := mux.Vars(r)["service_id"]
+	err := storage.RemoveServiceGCSafePoint(serviceID)
+	if err != nil {
+		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
+		return
+	}
+	h.rd.JSON(w, http.StatusOK, "Delete service GC safepoint successfully.")
+}
diff --git a/server/api/service_gc_safepoint_test.go b/server/api/service_gc_safepoint_test.go
new file mode 100644
index 00000000000..66a2eb0e5b3
--- /dev/null
+++ b/server/api/service_gc_safepoint_test.go
@@ -0,0 +1,95 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package api
+
+import (
+	"fmt"
+	"net/http"
+	"time"
+
+	. "github.com/pingcap/check"
+	"github.com/pingcap/kvproto/pkg/metapb"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/core"
+)
+
+var _ = Suite(&testServiceGCSafepointSuite{})
+
+type testServiceGCSafepointSuite struct {
+	svr       *server.Server
+	cleanup   cleanUpFunc
+	urlPrefix string
+}
+
+func (s *testServiceGCSafepointSuite) SetUpSuite(c *C) {
+	s.svr, s.cleanup = mustNewServer(c)
+	mustWaitLeader(c, []*server.Server{s.svr})
+
+	addr := s.svr.GetAddr()
+	s.urlPrefix = fmt.Sprintf("%s%s/api/v1", addr, apiPrefix)
+
+	mustBootstrapCluster(c, s.svr)
+	mustPutStore(c, s.svr, 1, metapb.StoreState_Up, nil)
+}
+
+func (s *testServiceGCSafepointSuite) TearDownSuite(c *C) {
+	s.cleanup()
+}
+
+func (s *testServiceGCSafepointSuite) TestRegionStats(c *C) {
+	sspURL := s.urlPrefix + "/gc/safepoint"
+
+	storage := s.svr.GetStorage()
+	list := &listServiceGCSafepoint{
+		ServiceGCSafepoints: []*core.ServiceSafePoint{
+			{
+				ServiceID: "a",
+				ExpiredAt: time.Now().Unix() + 10,
+				SafePoint: 1,
+			},
+			{
+				ServiceID: "b",
+				ExpiredAt: time.Now().Unix() + 10,
+				SafePoint: 2,
+			},
+			{
+				ServiceID: "c",
+				ExpiredAt: time.Now().Unix() + 10,
+				SafePoint: 3,
+			},
+		},
+		GCSafePoint: 1,
+	}
+	for _, ssp := range list.ServiceGCSafepoints {
+		err := storage.SaveServiceGCSafePoint(ssp)
+		c.Assert(err, IsNil)
+	}
+	storage.SaveGCSafePoint(1)
+
+	res, err := testDialClient.Get(sspURL)
+	c.Assert(err, IsNil)
+	listResp := &listServiceGCSafepoint{}
+	err = apiutil.ReadJSON(res.Body, listResp)
+	c.Assert(err, IsNil)
+	c.Assert(listResp, DeepEquals, list)
+
+	res, err = doDelete(testDialClient, sspURL+"/a")
+	c.Assert(err, IsNil)
+	c.Assert(res.StatusCode, Equals, http.StatusOK)
+
+	left, err := storage.GetAllServiceGCSafePoints()
+	c.Assert(err, IsNil)
+	c.Assert(left, DeepEquals, list.ServiceGCSafepoints[1:])
+}
diff --git a/server/api/stats.go b/server/api/stats.go
index 2db6fc48d8e..d367a594b9f 100644
--- a/server/api/stats.go
+++ b/server/api/stats.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ package api
 import (
 	"net/http"
 
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/stats_test.go b/server/api/stats_test.go
index 64390bf748d..fc9613620a4 100644
--- a/server/api/stats_test.go
+++ b/server/api/stats_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/statistics"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/statistics"
 )
 
 var _ = Suite(&testStatsSuite{})
diff --git a/server/api/status.go b/server/api/status.go
index b377b9d9981..e26f928cc5b 100644
--- a/server/api/status.go
+++ b/server/api/status.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@ package api
 import (
 	"net/http"
 
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/versioninfo"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/versioninfo"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/status_test.go b/server/api/status_test.go
index 6fc18cb58aa..ff26ac18f4d 100644
--- a/server/api/status_test.go
+++ b/server/api/status_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ import (
 	"io/ioutil"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/server/versioninfo"
+	"github.com/tikv/pd/server/versioninfo"
 )
 
 var _ = Suite(&testStatusAPISuite{})
diff --git a/server/api/store.go b/server/api/store.go
index 319fd92d60d..17af5055108 100644
--- a/server/api/store.go
+++ b/server/api/store.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,14 +21,14 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/pingcap/errcode"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/storelimit"
 	"github.com/unrolled/render"
 )
 
@@ -464,12 +464,35 @@ func (h *storesHandler) SetAllLimit(w http.ResponseWriter, r *http.Request) {
 // FIXME: details of output json body
 // @Tags store
 // @Summary Get limit of all stores in the cluster.
+// @Param include_tombstone query bool false "include Tombstone" default(false)
 // @Produce json
 // @Success 200 {object} string
 // @Failure 500 {string} string "PD server failed to proceed the request."
 // @Router /stores/limit [get]
 func (h *storesHandler) GetAllLimit(w http.ResponseWriter, r *http.Request) {
 	limits := h.GetScheduleConfig().StoreLimit
+	includeTombstone := false
+	var err error
+	if includeStr := r.URL.Query().Get("include_tombstone"); includeStr != "" {
+		includeTombstone, err = strconv.ParseBool(includeStr)
+		if err != nil {
+			h.rd.JSON(w, http.StatusBadRequest, err.Error())
+			return
+		}
+	}
+	if !includeTombstone {
+		returned := make(map[uint64]config.StoreLimitConfig, len(limits))
+		rc := getCluster(r.Context())
+		for storeID, v := range limits {
+			store := rc.GetStore(storeID)
+			if store == nil || store.IsTombstone() {
+				continue
+			}
+			returned[storeID] = v
+		}
+		h.rd.JSON(w, http.StatusOK, returned)
+		return
+	}
 	h.rd.JSON(w, http.StatusOK, limits)
 }
 
diff --git a/server/api/store_test.go b/server/api/store_test.go
index bf0809c7fde..8932c8c7696 100644
--- a/server/api/store_test.go
+++ b/server/api/store_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -28,8 +28,8 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/core"
 )
 
 var _ = Suite(&testStoreSuite{})
@@ -346,3 +346,52 @@ func (s *testStoreSuite) TestDownState(c *C) {
 	storeInfo = newStoreInfo(s.svr.GetScheduleConfig(), newStore)
 	c.Assert(storeInfo.Store.StateName, Equals, downStateName)
 }
+
+func (s *testStoreSuite) TestGetAllLimit(c *C) {
+	testcases := []struct {
+		name           string
+		url            string
+		expectedStores map[uint64]struct{}
+	}{
+		{
+			name: "includeTombstone",
+			url:  fmt.Sprintf("%s/stores/limit?include_tombstone=true", s.urlPrefix),
+			expectedStores: map[uint64]struct{}{
+				1: {},
+				4: {},
+				6: {},
+				7: {},
+			},
+		},
+		{
+			name: "excludeTombStone",
+			url:  fmt.Sprintf("%s/stores/limit?include_tombstone=false", s.urlPrefix),
+			expectedStores: map[uint64]struct{}{
+				1: {},
+				4: {},
+				6: {},
+			},
+		},
+		{
+			name: "default",
+			url:  fmt.Sprintf("%s/stores/limit", s.urlPrefix),
+			expectedStores: map[uint64]struct{}{
+				1: {},
+				4: {},
+				6: {},
+			},
+		},
+	}
+
+	for _, testcase := range testcases {
+		c.Logf(testcase.name)
+		info := make(map[uint64]interface{}, 4)
+		err := readJSON(testDialClient, testcase.url, &info)
+		c.Assert(err, IsNil)
+		c.Assert(len(info), Equals, len(testcase.expectedStores))
+		for id := range testcase.expectedStores {
+			_, ok := info[id]
+			c.Assert(ok, Equals, true)
+		}
+	}
+}
diff --git a/server/api/trend.go b/server/api/trend.go
index 73b3468d120..a893546a541 100644
--- a/server/api/trend.go
+++ b/server/api/trend.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/statistics"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/statistics"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/trend_test.go b/server/api/trend_test.go
index 3c831577a8f..3e4cdf10e25 100644
--- a/server/api/trend_test.go
+++ b/server/api/trend_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/operator"
 )
 
 var _ = Suite(&testTrendSuite{})
@@ -59,7 +59,7 @@ func (s *testTrendSuite) TestTrend(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(op, NotNil)
 	newPeerID := op.Step(0).(operator.AddLearner).PeerID
-	region5 = region5.Clone(core.WithAddPeer(&metapb.Peer{Id: newPeerID, StoreId: 3, IsLearner: true}), core.WithIncConfVer())
+	region5 = region5.Clone(core.WithAddPeer(&metapb.Peer{Id: newPeerID, StoreId: 3, Role: metapb.PeerRole_Learner}), core.WithIncConfVer())
 	mustRegionHeartbeat(c, svr, region5)
 	region5 = region5.Clone(core.WithPromoteLearner(newPeerID), core.WithRemoveStorePeer(2), core.WithIncConfVer())
 	mustRegionHeartbeat(c, svr, region5)
@@ -68,7 +68,7 @@ func (s *testTrendSuite) TestTrend(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(op, NotNil)
 	newPeerID = op.Step(0).(operator.AddLearner).PeerID
-	region6 = region6.Clone(core.WithAddPeer(&metapb.Peer{Id: newPeerID, StoreId: 3, IsLearner: true}), core.WithIncConfVer())
+	region6 = region6.Clone(core.WithAddPeer(&metapb.Peer{Id: newPeerID, StoreId: 3, Role: metapb.PeerRole_Learner}), core.WithIncConfVer())
 	mustRegionHeartbeat(c, svr, region6)
 	region6 = region6.Clone(core.WithPromoteLearner(newPeerID), core.WithLeader(region6.GetStorePeer(2)), core.WithRemoveStorePeer(1), core.WithIncConfVer())
 	mustRegionHeartbeat(c, svr, region6)
@@ -111,7 +111,7 @@ func (s *testTrendSuite) newRegionInfo(id uint64, startKey, endKey string, confV
 		peers = append(peers, p)
 	}
 	for _, id := range learners {
-		p := &metapb.Peer{Id: 10 + id, StoreId: id, IsLearner: true}
+		p := &metapb.Peer{Id: 10 + id, StoreId: id, Role: metapb.PeerRole_Learner}
 		peers = append(peers, p)
 	}
 	return core.NewRegionInfo(
diff --git a/server/api/util.go b/server/api/util.go
index d5d6be8e47d..f7e26524d43 100644
--- a/server/api/util.go
+++ b/server/api/util.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
 )
 
 var (
diff --git a/server/api/util_test.go b/server/api/util_test.go
index 1c52b786d64..c44fb678814 100644
--- a/server/api/util_test.go
+++ b/server/api/util_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import (
 	"net/http/httptest"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
+	"github.com/tikv/pd/pkg/apiutil"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/utiletcdhttpapi.go b/server/api/utiletcdhttpapi.go
index 22b3fe60240..76bb4a814fa 100644
--- a/server/api/utiletcdhttpapi.go
+++ b/server/api/utiletcdhttpapi.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/api/version.go b/server/api/version.go
index 2eedb9a37a9..002ddd50657 100644
--- a/server/api/version.go
+++ b/server/api/version.go
@@ -3,7 +3,7 @@ package api
 import (
 	"net/http"
 
-	"github.com/pingcap/pd/v4/server/versioninfo"
+	"github.com/tikv/pd/server/versioninfo"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/api/version_test.go b/server/api/version_test.go
index 21923c80e62..adbec0d40b5 100644
--- a/server/api/version_test.go
+++ b/server/api/version_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/failpoint"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
 )
 
 var _ = Suite(&testVersionSuite{})
@@ -34,7 +34,7 @@ type testVersionSuite struct{}
 
 func (s *testVersionSuite) TestGetVersion(c *C) {
 	// TODO: enable it.
-	c.Skip("Temporary disable. See issue: https://github.com/pingcap/pd/issues/1893")
+	c.Skip("Temporary disable. See issue: https://github.com/tikv/pd/issues/1893")
 
 	fname := filepath.Join(os.TempDir(), "stdout")
 	old := os.Stdout
@@ -59,7 +59,7 @@ func (s *testVersionSuite) TestGetVersion(c *C) {
 	go func(cfg *config.Config) {
 		s, err := server.CreateServer(ctx, cfg, NewHandler)
 		c.Assert(err, IsNil)
-		c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/memberNil", `return(true)`), IsNil)
+		c.Assert(failpoint.Enable("github.com/tikv/pd/server/memberNil", `return(true)`), IsNil)
 		reqCh <- struct{}{}
 		err = s.Run()
 		c.Assert(err, IsNil)
@@ -80,5 +80,5 @@ func (s *testVersionSuite) TestGetVersion(c *C) {
 		cancel()
 		testutil.CleanServer(cfg.DataDir)
 	}()
-	c.Assert(failpoint.Disable("github.com/pingcap/pd/v4/server/memberNil"), IsNil)
+	c.Assert(failpoint.Disable("github.com/tikv/pd/server/memberNil"), IsNil)
 }
diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
index b4104b35bab..7a09b6a739c 100644
--- a/server/cluster/cluster.go
+++ b/server/cluster/cluster.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,28 +23,31 @@ import (
 	"github.com/coreos/go-semver/semver"
 	"github.com/gogo/protobuf/proto"
 	"github.com/pingcap/errcode"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/kvproto/pkg/replication_modepb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/cache"
-	"github.com/pingcap/pd/v4/pkg/component"
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pingcap/pd/v4/pkg/logutil"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/id"
-	syncer "github.com/pingcap/pd/v4/server/region_syncer"
-	"github.com/pingcap/pd/v4/server/replication"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/checker"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
-	"github.com/pingcap/pd/v4/server/statistics"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/cache"
+	"github.com/tikv/pd/pkg/component"
+	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/pkg/keyutil"
+	"github.com/tikv/pd/pkg/logutil"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/id"
+	syncer "github.com/tikv/pd/server/region_syncer"
+	"github.com/tikv/pd/server/replication"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/checker"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedule/placement"
+	"github.com/tikv/pd/server/schedule/storelimit"
+	"github.com/tikv/pd/server/statistics"
+	"github.com/tikv/pd/server/versioninfo"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
 )
@@ -449,27 +452,27 @@ func (c *RaftCluster) RemoveSuspectRegion(id uint64) {
 // AddSuspectKeyRange adds the key range with the its ruleID as the key
 // The instance of each keyRange is like following format:
 // [2][]byte: start key/end key
-func (c *RaftCluster) AddSuspectKeyRange(key string, keyRanges [2][]byte) {
+func (c *RaftCluster) AddSuspectKeyRange(start, end []byte) {
 	c.Lock()
 	defer c.Unlock()
-	c.suspectKeyRanges.Put(key, keyRanges)
+	c.suspectKeyRanges.Put(keyutil.BuildKeyRangeKey(start, end), [2][]byte{start, end})
 }
 
 // PopOneSuspectKeyRange gets one suspect keyRange group.
 // it would return value and true if pop success, or return empty [][2][]byte and false
 // if suspectKeyRanges couldn't pop keyRange group.
-func (c *RaftCluster) PopOneSuspectKeyRange() (string, [2][]byte, bool) {
+func (c *RaftCluster) PopOneSuspectKeyRange() ([2][]byte, bool) {
 	c.Lock()
 	defer c.Unlock()
-	key, value, success := c.suspectKeyRanges.Pop()
+	_, value, success := c.suspectKeyRanges.Pop()
 	if !success {
-		return "", [2][]byte{}, false
+		return [2][]byte{}, false
 	}
 	v, ok := value.([2][]byte)
 	if !ok {
-		return "", [2][]byte{}, false
+		return [2][]byte{}, false
 	}
-	return key, v, true
+	return v, true
 }
 
 // ClearSuspectKeyRanges clears the suspect keyRanges, only for unit test
@@ -497,8 +500,8 @@ func (c *RaftCluster) HandleStoreHeartbeat(stats *pdpb.StoreStats) error {
 			zap.Uint64("available", newStore.GetAvailable()))
 	}
 	if newStore.NeedPersist() && c.storage != nil {
-		if err := c.storage.SaveStore(store.GetMeta()); err != nil {
-			log.Error("failed to persist store", zap.Uint64("store-id", newStore.GetID()))
+		if err := c.storage.SaveStore(newStore.GetMeta()); err != nil {
+			log.Error("failed to persist store", zap.Uint64("store-id", newStore.GetID()), errs.ZapError(errs.ErrPersistStore, err))
 		} else {
 			newStore = newStore.Clone(core.SetLastPersistTime(time.Now()))
 		}
@@ -507,6 +510,7 @@ func (c *RaftCluster) HandleStoreHeartbeat(stats *pdpb.StoreStats) error {
 	c.storesStats.Observe(newStore.GetID(), newStore.GetStoreStats())
 	c.storesStats.UpdateTotalBytesRate(c.core.GetStores)
 	c.storesStats.UpdateTotalKeysRate(c.core.GetStores)
+	c.storesStats.FilterUnhealthyStore(c)
 
 	// c.limiter is nil before "start" is called
 	if c.limiter != nil && c.opt.GetStoreLimitMode() == "auto" {
@@ -625,7 +629,7 @@ func (c *RaftCluster) processRegionHeartbeat(region *core.RegionInfo) error {
 					log.Error("failed to delete region from storage",
 						zap.Uint64("region-id", item.GetID()),
 						zap.Stringer("region-meta", core.RegionToHexMeta(item.GetMeta())),
-						zap.Error(err))
+						errs.ZapError(errs.ErrDeleteRegion, err))
 				}
 			}
 		}
@@ -677,7 +681,7 @@ func (c *RaftCluster) processRegionHeartbeat(region *core.RegionInfo) error {
 			log.Error("failed to save region to storage",
 				zap.Uint64("region-id", region.GetID()),
 				zap.Stringer("region-meta", core.RegionToHexMeta(region.GetMeta())),
-				zap.Error(err))
+				errs.ZapError(errs.ErrSaveRegion, err))
 		}
 		regionEventCounter.WithLabelValues("update_kv").Inc()
 	}
@@ -827,6 +831,7 @@ func (c *RaftCluster) GetRegionStats(startKey, endKey []byte) *statistics.Region
 }
 
 // GetStoresStats returns stores' statistics from cluster.
+// And it will be unnecessary to filter unhealthy store, because it has been solved in process heartbeat
 func (c *RaftCluster) GetStoresStats() *statistics.StoresStats {
 	c.RLock()
 	defer c.RUnlock()
@@ -900,12 +905,12 @@ func (c *RaftCluster) PutStore(store *metapb.Store, force bool) error {
 		return errors.Errorf("invalid put store %v", store)
 	}
 
-	v, err := ParseVersion(store.GetVersion())
+	v, err := versioninfo.ParseVersion(store.GetVersion())
 	if err != nil {
 		return errors.Errorf("invalid put store %v, error: %s", store, err)
 	}
 	clusterVersion := *c.opt.GetClusterVersion()
-	if !IsCompatible(clusterVersion, *v) {
+	if !versioninfo.IsCompatible(clusterVersion, *v) {
 		return errors.Errorf("version should compatible with version  %s, got %s", clusterVersion, v)
 	}
 
@@ -1135,7 +1140,7 @@ func (c *RaftCluster) checkStores() {
 			if err := c.BuryStore(offlineStore.GetId(), false); err != nil {
 				log.Error("bury store failed",
 					zap.Stringer("store", offlineStore),
-					zap.Error(err))
+					errs.ZapError(errs.ErrBuryStore, err))
 			}
 		} else {
 			offlineStores = append(offlineStores, offlineStore)
@@ -1166,7 +1171,7 @@ func (c *RaftCluster) RemoveTombStoneRecords() error {
 			if err != nil {
 				log.Error("delete store failed",
 					zap.Stringer("store", store.GetMeta()),
-					zap.Error(err))
+					errs.ZapError(errs.ErrDeleteStore, err))
 				return err
 			}
 			c.RemoveStoreLimit(store.GetID())
@@ -1239,7 +1244,7 @@ func (c *RaftCluster) resetClusterMetrics() {
 func (c *RaftCluster) collectHealthStatus() {
 	members, err := GetMembers(c.etcdClient)
 	if err != nil {
-		log.Error("get members error", zap.Error(err))
+		log.Error("get members error", errs.ZapError(errs.ErrGetMembers, err))
 	}
 	unhealth := CheckHealth(c.httpClient, members)
 	for _, member := range members {
@@ -1288,36 +1293,32 @@ func (c *RaftCluster) AllocID() (uint64, error) {
 func (c *RaftCluster) OnStoreVersionChange() {
 	c.RLock()
 	defer c.RUnlock()
-	var (
-		minVersion     *semver.Version
-		clusterVersion *semver.Version
-	)
-
+	var minVersion *semver.Version
 	stores := c.GetStores()
 	for _, s := range stores {
 		if s.IsTombstone() {
 			continue
 		}
-		v := MustParseVersion(s.GetVersion())
+		v := versioninfo.MustParseVersion(s.GetVersion())
 
 		if minVersion == nil || v.LessThan(*minVersion) {
 			minVersion = v
 		}
 	}
-	clusterVersion = c.opt.GetClusterVersion()
+	clusterVersion := c.opt.GetClusterVersion()
 	// If the cluster version of PD is less than the minimum version of all stores,
 	// it will update the cluster version.
 	failpoint.Inject("versionChangeConcurrency", func() {
 		time.Sleep(500 * time.Millisecond)
 	})
 
-	if (*clusterVersion).LessThan(*minVersion) {
+	if minVersion != nil && clusterVersion.LessThan(*minVersion) {
 		if !c.opt.CASClusterVersion(clusterVersion, minVersion) {
 			log.Error("cluster version changed by API at the same time")
 		}
 		err := c.opt.Persist(c.storage)
 		if err != nil {
-			log.Error("persist cluster version meet error", zap.Error(err))
+			log.Error("persist cluster version meet error", errs.ZapError(errs.ErrPersistClusterVersion, err))
 		}
 		log.Info("cluster version changed",
 			zap.Stringer("old-cluster-version", clusterVersion),
@@ -1330,12 +1331,18 @@ func (c *RaftCluster) changedRegionNotifier() <-chan *core.RegionInfo {
 }
 
 // IsFeatureSupported checks if the feature is supported by current cluster.
-func (c *RaftCluster) IsFeatureSupported(f Feature) bool {
+func (c *RaftCluster) IsFeatureSupported(f versioninfo.Feature) bool {
 	c.RLock()
 	defer c.RUnlock()
 	clusterVersion := *c.opt.GetClusterVersion()
-	minSupportVersion := *MinSupportedVersion(f)
-	return !clusterVersion.LessThan(minSupportVersion)
+	minSupportVersion := *versioninfo.MinSupportedVersion(f)
+	// For features before version 5.0 (such as BatchSplit), strict version checks are performed according to the
+	// original logic. But according to Semantic Versioning, specify a version MAJOR.MINOR.PATCH, PATCH is used when you
+	// make backwards compatible bug fixes. In version 5.0 and later, we need to strictly comply.
+	if versioninfo.IsCompatible(minSupportVersion, *versioninfo.MinSupportedVersion(versioninfo.Version4_0)) {
+		return !clusterVersion.LessThan(minSupportVersion)
+	}
+	return versioninfo.IsCompatible(minSupportVersion, clusterVersion)
 }
 
 // GetConfig gets config from cluster.
@@ -1793,7 +1800,7 @@ func CheckHealth(client *http.Client, members []*pdpb.Member) map[uint64]*pdpb.M
 			ctx, cancel := context.WithTimeout(context.Background(), clientTimeout)
 			req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("%s%s", cURL, healthURL), nil)
 			if err != nil {
-				log.Error("failed to new request", zap.Error(err))
+				log.Error("failed to new request", errs.ZapError(errs.ErrNewHTTPRequest, err))
 				cancel()
 				continue
 			}
diff --git a/server/cluster/cluster_stat.go b/server/cluster/cluster_stat.go
index 6bf288f2e1e..b2ccc3852b9 100644
--- a/server/cluster/cluster_stat.go
+++ b/server/cluster/cluster_stat.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/slice"
-	"github.com/pingcap/pd/v4/server/statistics"
+	"github.com/tikv/pd/pkg/slice"
+	"github.com/tikv/pd/server/statistics"
 	"go.uber.org/zap"
 )
 
diff --git a/server/cluster/cluster_stat_test.go b/server/cluster/cluster_stat_test.go
index 8f01ee7acf6..674b6312363 100644
--- a/server/cluster/cluster_stat_test.go
+++ b/server/cluster/cluster_stat_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/cluster/cluster_test.go b/server/cluster/cluster_test.go
index 1d4410d12ab..aa8267112b8 100644
--- a/server/cluster/cluster_test.go
+++ b/server/cluster/cluster_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,12 +25,13 @@ import (
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockid"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/id"
-	"github.com/pingcap/pd/v4/server/kv"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/pkg/mock/mockid"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/id"
+	"github.com/tikv/pd/server/kv"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/versioninfo"
 )
 
 func Test(t *testing.T) {
@@ -48,6 +49,7 @@ func (s *testClusterInfoSuite) TestStoreHeartbeat(c *C) {
 
 	n, np := uint64(3), uint64(3)
 	stores := newTestStores(n)
+	storeMetasAfterHeartbeat := make([]*metapb.Store, 0, n)
 	regions := newTestRegions(n, np)
 
 	for _, region := range regions {
@@ -74,16 +76,50 @@ func (s *testClusterInfoSuite) TestStoreHeartbeat(c *C) {
 		s := cluster.GetStore(store.GetID())
 		c.Assert(s.GetLastHeartbeatTS().UnixNano(), Not(Equals), int64(0))
 		c.Assert(s.GetStoreStats(), DeepEquals, storeStats)
+
+		storeMetasAfterHeartbeat = append(storeMetasAfterHeartbeat, s.GetMeta())
 	}
 
 	c.Assert(cluster.GetStoreCount(), Equals, int(n))
 
-	for _, store := range stores {
+	for i, store := range stores {
 		tmp := &metapb.Store{}
 		ok, err := cluster.storage.LoadStore(store.GetID(), tmp)
 		c.Assert(ok, IsTrue)
 		c.Assert(err, IsNil)
-		c.Assert(tmp, DeepEquals, store.GetMeta())
+		c.Assert(tmp, DeepEquals, storeMetasAfterHeartbeat[i])
+	}
+}
+
+func (s *testClusterInfoSuite) TestFilterUnhealthyStore(c *C) {
+	_, opt, err := newTestScheduleConfig()
+	c.Assert(err, IsNil)
+	cluster := newTestRaftCluster(mockid.NewIDAllocator(), opt, core.NewStorage(kv.NewMemoryKV()), core.NewBasicCluster())
+
+	stores := newTestStores(3)
+	for _, store := range stores {
+		storeStats := &pdpb.StoreStats{
+			StoreId:     store.GetID(),
+			Capacity:    100,
+			Available:   50,
+			RegionCount: 1,
+		}
+		c.Assert(cluster.putStoreLocked(store), IsNil)
+		c.Assert(cluster.HandleStoreHeartbeat(storeStats), IsNil)
+		c.Assert(cluster.storesStats.GetRollingStoreStats(store.GetID()), NotNil)
+	}
+
+	for _, store := range stores {
+		storeStats := &pdpb.StoreStats{
+			StoreId:     store.GetID(),
+			Capacity:    100,
+			Available:   50,
+			RegionCount: 1,
+		}
+		newStore := store.Clone(core.SetStoreState(metapb.StoreState_Tombstone))
+		c.Assert(cluster.putStoreLocked(newStore), IsNil)
+		c.Assert(cluster.HandleStoreHeartbeat(storeStats), IsNil)
+		c.Assert(cluster.storesStats.GetRollingStoreStats(store.GetID()), IsNil)
 	}
 }
 
@@ -333,13 +369,13 @@ func (s *testClusterInfoSuite) TestConcurrentRegionHeartbeat(c *C) {
 
 	var wg sync.WaitGroup
 	wg.Add(1)
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/cluster/concurrentRegionHeartbeat", "return(true)"), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/cluster/concurrentRegionHeartbeat", "return(true)"), IsNil)
 	go func() {
 		defer wg.Done()
 		cluster.processRegionHeartbeat(source)
 	}()
 	time.Sleep(100 * time.Millisecond)
-	c.Assert(failpoint.Disable("github.com/pingcap/pd/v4/server/cluster/concurrentRegionHeartbeat"), IsNil)
+	c.Assert(failpoint.Disable("github.com/tikv/pd/server/cluster/concurrentRegionHeartbeat"), IsNil)
 	c.Assert(cluster.processRegionHeartbeat(target), IsNil)
 	wg.Wait()
 	checkRegion(c, cluster.GetRegionByKey([]byte{}), target)
@@ -660,7 +696,7 @@ func newTestScheduleConfig() (*config.ScheduleConfig, *config.PersistOptions, er
 		return nil, nil, err
 	}
 	opt := config.NewPersistOptions(cfg)
-	opt.SetClusterVersion(MinSupportedVersion(Version2_0))
+	opt.SetClusterVersion(versioninfo.MinSupportedVersion(versioninfo.Version2_0))
 	return &cfg.Schedule, opt, nil
 }
 
diff --git a/server/cluster/cluster_worker.go b/server/cluster/cluster_worker.go
index 3e916921c04..0b74e414729 100644
--- a/server/cluster/cluster_worker.go
+++ b/server/cluster/cluster_worker.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,13 +17,14 @@ import (
 	"bytes"
 
 	"github.com/gogo/protobuf/proto"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedulers"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedulers"
+	"github.com/tikv/pd/server/versioninfo"
 	"go.uber.org/zap"
 )
 
@@ -66,7 +67,7 @@ func (c *RaftCluster) HandleAskSplit(request *pdpb.AskSplitRequest) (*pdpb.AskSp
 		}
 	}
 
-	if c.IsFeatureSupported(RegionMerge) {
+	if c.IsFeatureSupported(versioninfo.RegionMerge) {
 		// Disable merge for the 2 regions in a period of time.
 		c.GetMergeChecker().RecordRegionSplit([]uint64{reqRegion.GetId(), newRegionID})
 	}
@@ -132,7 +133,7 @@ func (c *RaftCluster) HandleAskBatchSplit(request *pdpb.AskBatchSplitRequest) (*
 	}
 
 	recordRegions = append(recordRegions, reqRegion.GetId())
-	if c.IsFeatureSupported(RegionMerge) {
+	if c.IsFeatureSupported(versioninfo.RegionMerge) {
 		// Disable merge the regions in a period of time.
 		c.GetMergeChecker().RecordRegionSplit(recordRegions)
 	}
diff --git a/server/cluster/cluster_worker_test.go b/server/cluster/cluster_worker_test.go
index d41d1efba95..837640959ec 100644
--- a/server/cluster/cluster_worker_test.go
+++ b/server/cluster/cluster_worker_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 
-	"github.com/pingcap/pd/v4/pkg/mock/mockid"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/kv"
-	_ "github.com/pingcap/pd/v4/server/schedulers"
+	"github.com/tikv/pd/pkg/mock/mockid"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/kv"
+	_ "github.com/tikv/pd/server/schedulers"
 )
 
 var _ = Suite(&testClusterWorkerSuite{})
diff --git a/server/cluster/coordinator.go b/server/cluster/coordinator.go
index b9baa7e3306..7f15cdb7045 100644
--- a/server/cluster/coordinator.go
+++ b/server/cluster/coordinator.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,16 +22,15 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/keyutil"
-	"github.com/pingcap/pd/v4/pkg/logutil"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedulers"
-	"github.com/pingcap/pd/v4/server/statistics"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/logutil"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedulers"
+	"github.com/tikv/pd/server/statistics"
 	"go.uber.org/zap"
 )
 
@@ -166,7 +165,7 @@ func (c *coordinator) patrolRegions() {
 // The regions of new version key range and old version key range would be placed into
 // the suspect regions map
 func (c *coordinator) checkSuspectKeyRanges() {
-	_, keyRange, success := c.cluster.PopOneSuspectKeyRange()
+	keyRange, success := c.cluster.PopOneSuspectKeyRange()
 	if !success {
 		return
 	}
@@ -184,11 +183,7 @@ func (c *coordinator) checkSuspectKeyRanges() {
 	// keyRange[0] and keyRange[1] after scan regions, so we put the end key and keyRange[1] into Suspect KeyRanges
 	lastRegion := regions[len(regions)-1]
 	if lastRegion.GetEndKey() != nil && bytes.Compare(lastRegion.GetEndKey(), keyRange[1]) < 0 {
-		restKeyRange := [2][]byte{
-			lastRegion.GetEndKey(),
-			keyRange[1],
-		}
-		c.cluster.AddSuspectKeyRange(keyutil.BuildKeyRangeKey(lastRegion.GetEndKey(), keyRange[1]), restKeyRange)
+		c.cluster.AddSuspectKeyRange(lastRegion.GetEndKey(), keyRange[1])
 	}
 	c.cluster.AddSuspectRegions(regionIDList...)
 }
diff --git a/server/cluster/coordinator_test.go b/server/cluster/coordinator_test.go
index 94059dded59..0c28940b121 100644
--- a/server/cluster/coordinator_test.go
+++ b/server/cluster/coordinator_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,17 +25,18 @@ import (
 	"github.com/pingcap/kvproto/pkg/eraftpb"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockhbstream"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/kv"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
-	"github.com/pingcap/pd/v4/server/schedulers"
-	"github.com/pingcap/pd/v4/server/statistics"
+	"github.com/tikv/pd/pkg/mock/mockhbstream"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/kv"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedule/storelimit"
+	"github.com/tikv/pd/server/schedulers"
+	"github.com/tikv/pd/server/statistics"
 )
 
 func newTestOperator(regionID uint64, regionEpoch *metapb.RegionEpoch, kind operator.OpKind, steps ...operator.OpStep) *operator.Operator {
@@ -153,7 +154,7 @@ type testCoordinatorSuite struct {
 
 func (s *testCoordinatorSuite) SetUpSuite(c *C) {
 	s.ctx, s.cancel = context.WithCancel(context.Background())
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/schedule/unexpectedOperator", "return(true)"), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/schedule/unexpectedOperator", "return(true)"), IsNil)
 }
 
 func (s *testCoordinatorSuite) TearDownSuite(c *C) {
@@ -273,16 +274,6 @@ func (s *testCoordinatorSuite) TestCollectMetrics(c *C) {
 	wg.Wait()
 }
 
-func MaxUint64(nums ...uint64) uint64 {
-	result := uint64(0)
-	for _, num := range nums {
-		if num > result {
-			result = num
-		}
-	}
-	return result
-}
-
 func prepare(setCfg func(*config.ScheduleConfig), setTc func(*testCluster), run func(*coordinator), c *C) (*testCluster, *coordinator, func()) {
 	ctx, cancel := context.WithCancel(context.Background())
 	cfg, opt, err := newTestScheduleConfig()
@@ -333,7 +324,7 @@ func (s *testCoordinatorSuite) TestCheckRegion(c *C) {
 	s.checkRegion(c, tc, co, 1, false, 0)
 
 	r := tc.GetRegion(1)
-	p := &metapb.Peer{Id: 1, StoreId: 1, IsLearner: true}
+	p := &metapb.Peer{Id: 1, StoreId: 1, Role: metapb.PeerRole_Learner}
 	r = r.Clone(
 		core.WithAddPeer(p),
 		core.WithPendingPeers(append(r.GetPendingPeers(), p)),
@@ -371,7 +362,7 @@ func (s *testCoordinatorSuite) TestCheckerIsBusy(c *C) {
 	defer cleanup()
 
 	c.Assert(tc.addRegionStore(1, 0), IsNil)
-	num := 1 + MaxUint64(co.cluster.GetReplicaScheduleLimit(), co.cluster.GetMergeScheduleLimit())
+	num := 1 + typeutil.MaxUint64(co.cluster.GetReplicaScheduleLimit(), co.cluster.GetMergeScheduleLimit())
 	var operatorKinds = []operator.OpKind{
 		operator.OpReplica, operator.OpRegion | operator.OpMerge,
 	}
@@ -875,7 +866,7 @@ type testOperatorControllerSuite struct {
 
 func (s *testOperatorControllerSuite) SetUpSuite(c *C) {
 	s.ctx, s.cancel = context.WithCancel(context.Background())
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/schedule/unexpectedOperator", "return(true)"), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/schedule/unexpectedOperator", "return(true)"), IsNil)
 }
 
 func (s *testOperatorControllerSuite) TearDownSuite(c *C) {
@@ -996,7 +987,7 @@ type testScheduleControllerSuite struct {
 
 func (s *testScheduleControllerSuite) SetUpSuite(c *C) {
 	s.ctx, s.cancel = context.WithCancel(context.Background())
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/schedule/unexpectedOperator", "return(true)"), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/schedule/unexpectedOperator", "return(true)"), IsNil)
 }
 
 func (s *testScheduleControllerSuite) TearDownSuite(c *C) {
diff --git a/server/cluster/metrics.go b/server/cluster/metrics.go
index 838aacf399d..21820e7f0fa 100644
--- a/server/cluster/metrics.go
+++ b/server/cluster/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/cluster/store_limiter.go b/server/cluster/store_limiter.go
index 2f9c91f6d5d..9b0bc98a63a 100644
--- a/server/cluster/store_limiter.go
+++ b/server/cluster/store_limiter.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedule/storelimit"
 	"go.uber.org/zap"
 )
 
diff --git a/server/cluster/store_limiter_test.go b/server/cluster/store_limiter_test.go
index 35177a97496..718d4189fae 100644
--- a/server/cluster/store_limiter_test.go
+++ b/server/cluster/store_limiter_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@ package cluster
 import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/server/schedule/storelimit"
 )
 
 var _ = Suite(&testStoreLimiterSuite{})
diff --git a/server/config/config.go b/server/config/config.go
index d48d6a32d42..64fb0e5930f 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,18 +26,18 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pingcap/pd/v4/pkg/grpcutil"
-	"github.com/pingcap/pd/v4/pkg/metricutil"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
-	"github.com/pingcap/pd/v4/server/versioninfo"
+	"github.com/tikv/pd/pkg/grpcutil"
+	"github.com/tikv/pd/pkg/metricutil"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/storelimit"
+	"github.com/tikv/pd/server/versioninfo"
 
 	"github.com/BurntSushi/toml"
 	"github.com/coreos/go-semver/semver"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/log"
-	"github.com/pkg/errors"
 	"go.etcd.io/etcd/embed"
 	"go.etcd.io/etcd/pkg/transport"
 	"go.uber.org/zap"
diff --git a/server/config/config_test.go b/server/config/config_test.go
index 8963621f43f..ad2dccf2476 100644
--- a/server/config/config_test.go
+++ b/server/config/config_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,11 +24,11 @@ import (
 
 	"github.com/BurntSushi/toml"
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/kv"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/kv"
 
 	// Register schedulers.
-	_ "github.com/pingcap/pd/v4/server/schedulers"
+	_ "github.com/tikv/pd/server/schedulers"
 )
 
 func Test(t *testing.T) {
diff --git a/server/config/persist_options.go b/server/config/persist_options.go
index a71cd469ba8..2be5a91e39c 100644
--- a/server/config/persist_options.go
+++ b/server/config/persist_options.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,12 +22,12 @@ import (
 
 	"github.com/coreos/go-semver/semver"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/slice"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/kv"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
+	"github.com/tikv/pd/pkg/slice"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/kv"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/storelimit"
 )
 
 // PersistOptions wraps all configurations that need to persist to storage and
diff --git a/server/config/util.go b/server/config/util.go
index 498a475d807..6b3c43a8449 100644
--- a/server/config/util.go
+++ b/server/config/util.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ import (
 	"net/url"
 	"regexp"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pkg/errors"
 )
 
 const (
diff --git a/server/config/util_test.go b/server/config/util_test.go
index 399de3aa748..d93df95f0e8 100644
--- a/server/config/util_test.go
+++ b/server/config/util_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/core/basic_cluster.go b/server/core/basic_cluster.go
index 6bf090f59a7..a853e322027 100644
--- a/server/core/basic_cluster.go
+++ b/server/core/basic_cluster.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/slice"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
+	"github.com/tikv/pd/pkg/slice"
+	"github.com/tikv/pd/server/schedule/storelimit"
 	"go.uber.org/zap"
 )
 
diff --git a/server/core/errors.go b/server/core/errors.go
index 980664a5c6f..e02a102ca24 100644
--- a/server/core/errors.go
+++ b/server/core/errors.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import (
 	"net/http"
 
 	"github.com/pingcap/errcode"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pkg/errors"
 )
 
 var (
diff --git a/server/core/kind.go b/server/core/kind.go
index 9f7ec92fd88..c28de0624c8 100644
--- a/server/core/kind.go
+++ b/server/core/kind.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/core/peer.go b/server/core/peer.go
new file mode 100644
index 00000000000..dcf9ef119c2
--- /dev/null
+++ b/server/core/peer.go
@@ -0,0 +1,23 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package core
+
+import (
+	"github.com/pingcap/kvproto/pkg/metapb"
+)
+
+// IsLearner judges whether the Peer's Role is Learner.
+func IsLearner(peer *metapb.Peer) bool {
+	return peer.GetRole() == metapb.PeerRole_Learner
+}
diff --git a/server/core/region.go b/server/core/region.go
index 6b3c2055ce9..ed93927027b 100644
--- a/server/core/region.go
+++ b/server/core/region.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ func classifyVoterAndLearner(region *RegionInfo) {
 	learners := make([]*metapb.Peer, 0, 1)
 	voters := make([]*metapb.Peer, 0, len(region.meta.Peers))
 	for _, p := range region.meta.Peers {
-		if p.IsLearner {
+		if IsLearner(p) {
 			learners = append(learners, p)
 		} else {
 			voters = append(voters, p)
@@ -182,7 +182,7 @@ func (r *RegionInfo) GetDownPeer(peerID uint64) *metapb.Peer {
 // GetDownVoter returns the down voter with specified peer id.
 func (r *RegionInfo) GetDownVoter(peerID uint64) *metapb.Peer {
 	for _, down := range r.downPeers {
-		if down.GetPeer().GetId() == peerID && !down.GetPeer().IsLearner {
+		if down.GetPeer().GetId() == peerID && !IsLearner(down.GetPeer()) {
 			return down.GetPeer()
 		}
 	}
@@ -192,7 +192,7 @@ func (r *RegionInfo) GetDownVoter(peerID uint64) *metapb.Peer {
 // GetDownLearner returns the down learner with soecified peer id.
 func (r *RegionInfo) GetDownLearner(peerID uint64) *metapb.Peer {
 	for _, down := range r.downPeers {
-		if down.GetPeer().GetId() == peerID && down.GetPeer().IsLearner {
+		if down.GetPeer().GetId() == peerID && IsLearner(down.GetPeer()) {
 			return down.GetPeer()
 		}
 	}
@@ -212,7 +212,7 @@ func (r *RegionInfo) GetPendingPeer(peerID uint64) *metapb.Peer {
 // GetPendingVoter returns the pending voter with specified peer id.
 func (r *RegionInfo) GetPendingVoter(peerID uint64) *metapb.Peer {
 	for _, peer := range r.pendingPeers {
-		if peer.GetId() == peerID && !peer.IsLearner {
+		if peer.GetId() == peerID && !IsLearner(peer) {
 			return peer
 		}
 	}
@@ -222,7 +222,7 @@ func (r *RegionInfo) GetPendingVoter(peerID uint64) *metapb.Peer {
 // GetPendingLearner returns the pending learner peer with specified peer id.
 func (r *RegionInfo) GetPendingLearner(peerID uint64) *metapb.Peer {
 	for _, peer := range r.pendingPeers {
-		if peer.GetId() == peerID && peer.IsLearner {
+		if peer.GetId() == peerID && IsLearner(peer) {
 			return peer
 		}
 	}
diff --git a/server/core/region_option.go b/server/core/region_option.go
index 261e0dfc5d0..e29c86e8c7d 100644
--- a/server/core/region_option.go
+++ b/server/core/region_option.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ func WithLearners(learners []*metapb.Peer) RegionCreateOption {
 		for i := range peers {
 			for _, l := range learners {
 				if peers[i].GetId() == l.GetId() {
-					peers[i] = &metapb.Peer{Id: l.GetId(), StoreId: l.GetStoreId(), IsLearner: true}
+					peers[i] = &metapb.Peer{Id: l.GetId(), StoreId: l.GetStoreId(), Role: metapb.PeerRole_Learner}
 					break
 				}
 			}
@@ -236,7 +236,7 @@ func SetReplicationStatus(status *replication_modepb.RegionReplicationStatus) Re
 func WithAddPeer(peer *metapb.Peer) RegionCreateOption {
 	return func(region *RegionInfo) {
 		region.meta.Peers = append(region.meta.Peers, peer)
-		if peer.IsLearner {
+		if IsLearner(peer) {
 			region.learners = append(region.learners, peer)
 		} else {
 			region.voters = append(region.voters, peer)
@@ -249,7 +249,7 @@ func WithPromoteLearner(peerID uint64) RegionCreateOption {
 	return func(region *RegionInfo) {
 		for _, p := range region.GetPeers() {
 			if p.GetId() == peerID {
-				p.IsLearner = false
+				p.Role = metapb.PeerRole_Voter
 			}
 		}
 	}
diff --git a/server/core/region_storage.go b/server/core/region_storage.go
index cfbef3aef2b..516eb0b8460 100644
--- a/server/core/region_storage.go
+++ b/server/core/region_storage.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/kv"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/kv"
 	"go.uber.org/zap"
 )
 
diff --git a/server/core/region_test.go b/server/core/region_test.go
index f29daacacba..834188fc002 100644
--- a/server/core/region_test.go
+++ b/server/core/region_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockid"
-	"github.com/pingcap/pd/v4/server/id"
+	"github.com/tikv/pd/pkg/mock/mockid"
+	"github.com/tikv/pd/server/id"
 )
 
 func TestCore(t *testing.T) {
diff --git a/server/core/region_tree.go b/server/core/region_tree.go
index 34755b5ef29..a0bfdeadfa2 100644
--- a/server/core/region_tree.go
+++ b/server/core/region_tree.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -19,7 +19,7 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/btree"
+	"github.com/tikv/pd/pkg/btree"
 	"go.uber.org/zap"
 )
 
diff --git a/server/core/region_tree_test.go b/server/core/region_tree_test.go
index a98eb85debf..a76f3576b5d 100644
--- a/server/core/region_tree_test.go
+++ b/server/core/region_tree_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/core/storage.go b/server/core/storage.go
index 46ac598780d..059d0734e24 100644
--- a/server/core/storage.go
+++ b/server/core/storage.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,9 +25,9 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/kv"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/kv"
 	"go.etcd.io/etcd/clientv3"
 )
 
@@ -37,6 +37,7 @@ const (
 	schedulePath             = "schedule"
 	gcPath                   = "gc"
 	rulesPath                = "rules"
+	ruleGroupPath            = "rule_group"
 	replicationPath          = "replication_mode"
 	componentPath            = "component"
 	customScheduleConfigPath = "scheduler_config"
@@ -222,38 +223,58 @@ func (s *Storage) LoadConfig(cfg interface{}) (bool, error) {
 }
 
 // SaveRule stores a rule cfg to the rulesPath.
-func (s *Storage) SaveRule(ruleKey string, rules interface{}) error {
-	value, err := json.Marshal(rules)
-	if err != nil {
-		return errors.WithStack(err)
-	}
-	return s.Save(path.Join(rulesPath, ruleKey), string(value))
+func (s *Storage) SaveRule(ruleKey string, rule interface{}) error {
+	return s.SaveJSON(rulesPath, ruleKey, rule)
 }
 
 // DeleteRule removes a rule from storage.
 func (s *Storage) DeleteRule(ruleKey string) error {
-	return s.Base.Remove(path.Join(rulesPath, ruleKey))
+	return s.Remove(path.Join(rulesPath, ruleKey))
 }
 
 // LoadRules loads placement rules from storage.
-func (s *Storage) LoadRules(f func(k, v string)) (bool, error) {
-	// Range is ['rule/\x00', 'rule0'). 'rule0' is the upper bound of all rules because '0' is next char of '/' in
-	// ascii order.
-	nextKey := path.Join(rulesPath, "\x00")
-	endKey := rulesPath + "0"
+func (s *Storage) LoadRules(f func(k, v string)) error {
+	return s.LoadRangeByPrefix(rulesPath+"/", f)
+}
+
+// SaveRuleGroup stores a rule group config to storage.
+func (s *Storage) SaveRuleGroup(groupID string, group interface{}) error {
+	return s.SaveJSON(ruleGroupPath, groupID, group)
+}
+
+// DeleteRuleGroup removes a rule group from storage.
+func (s *Storage) DeleteRuleGroup(groupID string) error {
+	return s.Remove(path.Join(ruleGroupPath, groupID))
+}
+
+// LoadRuleGroups loads all rule groups from storage.
+func (s *Storage) LoadRuleGroups(f func(k, v string)) error {
+	return s.LoadRangeByPrefix(ruleGroupPath+"/", f)
+}
+
+// SaveJSON saves json format data to storage.
+func (s *Storage) SaveJSON(prefix, key string, data interface{}) error {
+	value, err := json.Marshal(data)
+	if err != nil {
+		return err
+	}
+	return s.Save(path.Join(prefix, key), string(value))
+}
+
+// LoadRangeByPrefix iterates all key-value pairs in the storage that has the prefix.
+func (s *Storage) LoadRangeByPrefix(prefix string, f func(k, v string)) error {
+	nextKey := prefix
+	endKey := clientv3.GetPrefixRangeEnd(prefix)
 	for {
 		keys, values, err := s.LoadRange(nextKey, endKey, minKVRangeLimit)
 		if err != nil {
-			return false, err
-		}
-		if len(keys) == 0 {
-			return false, nil
+			return err
 		}
 		for i := range keys {
-			f(strings.TrimPrefix(keys[i], rulesPath+"/"), values[i])
+			f(strings.TrimPrefix(keys[i], prefix), values[i])
 		}
 		if len(keys) < minKVRangeLimit {
-			return true, nil
+			return nil
 		}
 		nextKey = keys[len(keys)-1] + "\x00"
 	}
@@ -410,9 +431,9 @@ func (s *Storage) LoadGCSafePoint() (uint64, error) {
 
 // ServiceSafePoint is the safepoint for a specific service
 type ServiceSafePoint struct {
-	ServiceID string
-	ExpiredAt int64
-	SafePoint uint64
+	ServiceID string `json:"service_id"`
+	ExpiredAt int64  `json:"expired_at"`
+	SafePoint uint64 `json:"safe_point"`
 }
 
 // SaveServiceGCSafePoint saves a GC safepoint for the service
@@ -433,10 +454,9 @@ func (s *Storage) RemoveServiceGCSafePoint(serviceID string) error {
 }
 
 // LoadMinServiceGCSafePoint returns the minimum safepoint across all services
-func (s *Storage) LoadMinServiceGCSafePoint() (*ServiceSafePoint, error) {
-	prefix := path.Join(gcPath, "safe_point", "service")
-	// the next of 'e' is 'f'
-	prefixEnd := path.Join(gcPath, "safe_point", "servicf")
+func (s *Storage) LoadMinServiceGCSafePoint(now time.Time) (*ServiceSafePoint, error) {
+	prefix := path.Join(gcPath, "safe_point", "service") + "/"
+	prefixEnd := clientv3.GetPrefixRangeEnd(prefix)
 	keys, values, err := s.LoadRange(prefix, prefixEnd, 0)
 	if err != nil {
 		return nil, err
@@ -446,13 +466,12 @@ func (s *Storage) LoadMinServiceGCSafePoint() (*ServiceSafePoint, error) {
 	}
 
 	min := &ServiceSafePoint{SafePoint: math.MaxUint64}
-	now := time.Now().Unix()
 	for i, key := range keys {
 		ssp := &ServiceSafePoint{}
 		if err := json.Unmarshal([]byte(values[i]), ssp); err != nil {
 			return nil, err
 		}
-		if ssp.ExpiredAt < now {
+		if ssp.ExpiredAt < now.Unix() {
 			s.Remove(key)
 			continue
 		}
@@ -464,11 +483,36 @@ func (s *Storage) LoadMinServiceGCSafePoint() (*ServiceSafePoint, error) {
 	return min, nil
 }
 
+// GetAllServiceGCSafePoints returns all services GC safepoints
+func (s *Storage) GetAllServiceGCSafePoints() ([]*ServiceSafePoint, error) {
+	prefix := path.Join(gcPath, "safe_point", "service") + "/"
+	prefixEnd := clientv3.GetPrefixRangeEnd(prefix)
+	keys, values, err := s.LoadRange(prefix, prefixEnd, 0)
+	if err != nil {
+		return nil, err
+	}
+	if len(keys) == 0 {
+		return []*ServiceSafePoint{}, nil
+	}
+
+	ssps := make([]*ServiceSafePoint, 0, len(keys))
+	for i := range keys {
+		ssp := &ServiceSafePoint{}
+		if err := json.Unmarshal([]byte(values[i]), ssp); err != nil {
+			return nil, err
+		}
+		ssps = append(ssps, ssp)
+	}
+
+	return ssps, nil
+}
+
 // LoadAllScheduleConfig loads all schedulers' config.
 func (s *Storage) LoadAllScheduleConfig() ([]string, []string, error) {
-	keys, values, err := s.LoadRange(customScheduleConfigPath, clientv3.GetPrefixRangeEnd(customScheduleConfigPath), 1000)
+	prefix := customScheduleConfigPath + "/"
+	keys, values, err := s.LoadRange(prefix, clientv3.GetPrefixRangeEnd(prefix), 1000)
 	for i, key := range keys {
-		keys[i] = strings.TrimPrefix(key, customScheduleConfigPath+"/")
+		keys[i] = strings.TrimPrefix(key, prefix)
 	}
 	return keys, values, err
 }
diff --git a/server/core/storage_test.go b/server/core/storage_test.go
index f3556b60899..8ccbbffda6f 100644
--- a/server/core/storage_test.go
+++ b/server/core/storage_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,9 +22,10 @@ import (
 	"time"
 
 	. "github.com/pingcap/check"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/kv"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/kv"
+	"go.etcd.io/etcd/clientv3"
 )
 
 var _ = Suite(&testKVSuite{})
@@ -212,8 +213,8 @@ func (s *testKVSuite) TestSaveServiceGCSafePoint(c *C) {
 		c.Assert(storage.SaveServiceGCSafePoint(ssp), IsNil)
 	}
 
-	prefix := path.Join(gcPath, "safe_point", "service")
-	prefixEnd := path.Join(gcPath, "safe_point", "servicf")
+	prefix := path.Join(gcPath, "safe_point", "service") + "/"
+	prefixEnd := clientv3.GetPrefixRangeEnd(prefix)
 	keys, values, err := mem.LoadRange(prefix, prefixEnd, len(serviceSafePoints))
 	c.Assert(err, IsNil)
 	c.Assert(len(keys), Equals, 3)
@@ -244,7 +245,7 @@ func (s *testKVSuite) TestLoadMinServiceGCSafePoint(c *C) {
 		c.Assert(storage.SaveServiceGCSafePoint(ssp), IsNil)
 	}
 
-	ssp, err := storage.LoadMinServiceGCSafePoint()
+	ssp, err := storage.LoadMinServiceGCSafePoint(time.Now())
 	c.Assert(err, IsNil)
 	c.Assert(ssp.ServiceID, Equals, "2")
 	c.Assert(ssp.ExpiredAt, Equals, expireAt)
diff --git a/server/core/store.go b/server/core/store.go
index 429be4ee3bb..2889d097513 100644
--- a/server/core/store.go
+++ b/server/core/store.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
+	"github.com/tikv/pd/server/schedule/storelimit"
 	"go.uber.org/zap"
 )
 
diff --git a/server/core/store_option.go b/server/core/store_option.go
index 6ecc4e0c80d..a59e0eb8914 100644
--- a/server/core/store_option.go
+++ b/server/core/store_option.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
+	"github.com/tikv/pd/server/schedule/storelimit"
 )
 
 // StoreCreateOption is used to create store.
diff --git a/server/core/store_test.go b/server/core/store_test.go
index 4f790aea1ae..69c0f20f7e0 100644
--- a/server/core/store_test.go
+++ b/server/core/store_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/core/test_util.go b/server/core/test_util.go
index 65ea856bcd8..9719b1e23d9 100644
--- a/server/core/test_util.go
+++ b/server/core/test_util.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/election/leadership.go b/server/election/leadership.go
new file mode 100644
index 00000000000..ae03c29e55d
--- /dev/null
+++ b/server/election/leadership.go
@@ -0,0 +1,150 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package election
+
+import (
+	"context"
+	"sync/atomic"
+
+	"github.com/pingcap/errors"
+	"github.com/pingcap/kvproto/pkg/pdpb"
+	"github.com/pingcap/log"
+	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/server/kv"
+	"go.etcd.io/etcd/clientv3"
+	"go.uber.org/zap"
+)
+
+// GetLeader gets the coresponding leader from etcd by given leaderPath (as the key).
+func GetLeader(c *clientv3.Client, leaderPath string) (*pdpb.Member, int64, error) {
+	leader := &pdpb.Member{}
+	ok, rev, err := etcdutil.GetProtoMsgWithModRev(c, leaderPath, leader)
+	if err != nil {
+		return nil, 0, err
+	}
+	if !ok {
+		return nil, 0, nil
+	}
+
+	return leader, rev, nil
+}
+
+// Leadership is used to manage the leadership campaigning.
+type Leadership struct {
+	// purpose is used to show what this election for
+	Purpose string
+	// The lease which is used to get this leadership
+	lease  atomic.Value // stored as *lease
+	client *clientv3.Client
+	// leaderKey and leaderValue are key-value pair in etcd
+	leaderKey   string
+	leaderValue string
+}
+
+// NewLeadership creates a new Leadership.
+func NewLeadership(client *clientv3.Client, purpose string) *Leadership {
+	leadership := &Leadership{
+		Purpose: purpose,
+		client:  client,
+	}
+	return leadership
+}
+
+// getLease gets the lease of leadership, only if leadership is valid,
+// i.e the owner is a true leader, the lease is not nil.
+func (ls *Leadership) getLease() *lease {
+	l := ls.lease.Load()
+	if l == nil {
+		return nil
+	}
+	return l.(*lease)
+}
+
+func (ls *Leadership) setLease(lease *lease) {
+	ls.lease.Store(lease)
+}
+
+// GetClient is used to get the etcd client.
+func (ls *Leadership) GetClient() *clientv3.Client {
+	return ls.client
+}
+
+// Campaign is used to campaign the leader with given lease and returns a leadership
+func (ls *Leadership) Campaign(leaseTimeout int64, leaderPath, leaderData string) error {
+	ls.leaderKey = leaderPath
+	ls.leaderValue = leaderData
+	// Create a new lease to campaign
+	ls.setLease(&lease{
+		Purpose: ls.Purpose,
+		client:  ls.client,
+		lease:   clientv3.NewLease(ls.client),
+	})
+	if err := ls.getLease().Grant(leaseTimeout); err != nil {
+		return err
+	}
+	// The leader key must not exist, so the CreateRevision is 0.
+	resp, err := kv.NewSlowLogTxn(ls.client).
+		If(clientv3.Compare(clientv3.CreateRevision(leaderPath), "=", 0)).
+		Then(clientv3.OpPut(leaderPath, leaderData, clientv3.WithLease(ls.getLease().ID))).
+		Commit()
+	log.Info("check campaign resp", zap.Any("resp", resp), zap.Error(err))
+	if err != nil {
+		return errors.WithStack(err)
+	}
+	if !resp.Succeeded {
+		return errors.New("failed to campaign leader, other server may campaign ok")
+	}
+	log.Info("write leaderDate to leaderPath ok", zap.String("leaderPath", leaderPath), zap.String("purpose", ls.Purpose))
+	return nil
+}
+
+// Keep will keep the leadership available by update the lease's expired time continuously
+func (ls *Leadership) Keep(ctx context.Context) {
+	ls.getLease().KeepAlive(ctx)
+}
+
+// Check returns whether the leadership is still avalibale
+func (ls *Leadership) Check() bool {
+	return ls != nil && ls.getLease() != nil && !ls.getLease().IsExpired()
+}
+
+// LeaderTxn returns txn() with a leader comparison to guarantee that
+// the transaction can be executed only if the server is leader.
+func (ls *Leadership) LeaderTxn(cs ...clientv3.Cmp) clientv3.Txn {
+	txn := kv.NewSlowLogTxn(ls.client)
+	return txn.If(append(cs, ls.leaderCmp())...)
+}
+
+func (ls *Leadership) leaderCmp() clientv3.Cmp {
+	return clientv3.Compare(clientv3.Value(ls.leaderKey), "=", ls.leaderValue)
+}
+
+// DeleteLeader deletes the coresponding leader from etcd by given leaderPath (as the key).
+func (ls *Leadership) DeleteLeader() error {
+	// delete leader itself and let others start a new election again.
+	resp, err := ls.LeaderTxn().Then(clientv3.OpDelete(ls.leaderKey)).Commit()
+	if err != nil {
+		return errors.WithStack(err)
+	}
+	if !resp.Succeeded {
+		return errors.New("resign leader failed, we are not leader already")
+	}
+
+	return nil
+}
+
+// Reset does some defer job such as closing lease, resetting lease etc.
+func (ls *Leadership) Reset() {
+	ls.getLease().Close()
+}
diff --git a/server/member/lease.go b/server/election/lease.go
similarity index 59%
rename from server/member/lease.go
rename to server/election/lease.go
index 87fd62a2766..a90992006c8 100644
--- a/server/member/lease.go
+++ b/server/election/lease.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,39 +11,42 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package member
+package election
 
 import (
 	"context"
 	"sync/atomic"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/etcdutil"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
 )
 
-// LeaderLease is used for renewing leadership of PD server.
-type LeaderLease struct {
-	client       *clientv3.Client
-	lease        clientv3.Lease
-	ID           clientv3.LeaseID
-	leaseTimeout time.Duration
-
-	expireTime atomic.Value
-}
+const (
+	revokeLeaseTimeout = time.Second
+	requestTimeout     = etcdutil.DefaultRequestTimeout
+	slowRequestTime    = etcdutil.DefaultSlowRequestTime
+)
 
-// NewLeaderLease creates a lease.
-func NewLeaderLease(client *clientv3.Client) *LeaderLease {
-	return &LeaderLease{
-		client: client,
-		lease:  clientv3.NewLease(client),
-	}
+// lease is used as the low-level mechanism for campaigning and renewing elected leadership.
+// The way to gain and maintain leadership is to update and keep the lease alive continuously.
+type lease struct {
+	// purpose is used to show what this election for
+	Purpose string
+	// etcd client and lease
+	client *clientv3.Client
+	lease  clientv3.Lease
+	ID     clientv3.LeaseID
+	// leaseTimeout and expireTime are used to control the lease's lifetime
+	leaseTimeout time.Duration
+	expireTime   atomic.Value
 }
 
 // Grant uses `lease.Grant` to initialize the lease and expireTime.
-func (l *LeaderLease) Grant(leaseTimeout int64) error {
+func (l *lease) Grant(leaseTimeout int64) error {
 	start := time.Now()
 	ctx, cancel := context.WithTimeout(l.client.Ctx(), requestTimeout)
 	leaseResp, err := l.lease.Grant(ctx, leaseTimeout)
@@ -52,18 +55,17 @@ func (l *LeaderLease) Grant(leaseTimeout int64) error {
 		return errors.WithStack(err)
 	}
 	if cost := time.Since(start); cost > slowRequestTime {
-		log.Warn("lease grants too slow", zap.Duration("cost", cost))
+		log.Warn("lease grants too slow", zap.Duration("cost", cost), zap.String("purpose", l.Purpose))
 	}
+	log.Info("lease granted", zap.Int64("lease-id", int64(leaseResp.ID)), zap.Int64("lease-timeout", leaseTimeout), zap.String("purpose", l.Purpose))
 	l.ID = leaseResp.ID
 	l.leaseTimeout = time.Duration(leaseTimeout) * time.Second
 	l.expireTime.Store(start.Add(time.Duration(leaseResp.TTL) * time.Second))
 	return nil
 }
 
-const revokeLeaseTimeout = time.Second
-
 // Close releases the lease.
-func (l *LeaderLease) Close() error {
+func (l *lease) Close() error {
 	// Reset expire time.
 	l.expireTime.Store(time.Time{})
 	// Try to revoke lease to make subsequent elections faster.
@@ -73,14 +75,17 @@ func (l *LeaderLease) Close() error {
 	return l.lease.Close()
 }
 
-// IsExpired checks if the lease is expired. If it returns true, current PD
-// server should step down and try to re-elect again.
-func (l *LeaderLease) IsExpired() bool {
+// IsExpired checks if the lease is expired. If it returns true,
+// current leader should step down and try to re-elect again.
+func (l *lease) IsExpired() bool {
+	if l.expireTime.Load() == nil {
+		return false
+	}
 	return time.Now().After(l.expireTime.Load().(time.Time))
 }
 
 // KeepAlive auto renews the lease and update expireTime.
-func (l *LeaderLease) KeepAlive(ctx context.Context) {
+func (l *lease) KeepAlive(ctx context.Context) {
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 	timeCh := l.keepAliveWorker(ctx, l.leaseTimeout/3)
@@ -94,6 +99,7 @@ func (l *LeaderLease) KeepAlive(ctx context.Context) {
 				l.expireTime.Store(t)
 			}
 		case <-time.After(l.leaseTimeout):
+			log.Info("lease timeout", zap.Time("expire", l.expireTime.Load().(time.Time)), zap.String("purpose", l.Purpose))
 			return
 		case <-ctx.Done():
 			return
@@ -102,13 +108,16 @@ func (l *LeaderLease) KeepAlive(ctx context.Context) {
 }
 
 // Periodically call `lease.KeepAliveOnce` and post back latest received expire time into the channel.
-func (l *LeaderLease) keepAliveWorker(ctx context.Context, interval time.Duration) <-chan time.Time {
+func (l *lease) keepAliveWorker(ctx context.Context, interval time.Duration) <-chan time.Time {
 	ch := make(chan time.Time)
 
 	go func() {
 		ticker := time.NewTicker(interval)
 		defer ticker.Stop()
 
+		log.Info("start lease keep alive worker", zap.Duration("interval", interval), zap.String("purpose", l.Purpose))
+		defer log.Info("stop lease keep alive worker", zap.String("purpose", l.Purpose))
+
 		for {
 			go func() {
 				start := time.Now()
@@ -116,7 +125,7 @@ func (l *LeaderLease) keepAliveWorker(ctx context.Context, interval time.Duratio
 				defer cancel()
 				res, err := l.lease.KeepAliveOnce(ctx1, l.ID)
 				if err != nil {
-					log.Warn("leader lease keep alive failed", zap.Error(err))
+					log.Warn("lease keep alive failed", zap.Error(err), zap.String("purpose", l.Purpose))
 					return
 				}
 				if res.TTL > 0 {
diff --git a/server/grpc_service.go b/server/grpc_service.go
index c9858a0a850..8df5da6f74e 100644
--- a/server/grpc_service.go
+++ b/server/grpc_service.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,14 +21,16 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/errs"
-	"github.com/pingcap/pd/v4/server/cluster"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/tsoutil"
+	"github.com/tikv/pd/server/cluster"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/versioninfo"
 	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -90,7 +92,7 @@ func (s *Server) Tso(stream pdpb.PD_TsoServer) error {
 			return status.Errorf(codes.FailedPrecondition, "mismatch cluster id, need %d but got %d", s.clusterID, request.GetHeader().GetClusterId())
 		}
 		count := request.GetCount()
-		ts, err := s.tso.GetRespTS(count)
+		ts, err := s.tsoAllocator.GenerateTSO(count)
 		if err != nil {
 			return status.Errorf(codes.Unknown, err.Error())
 		}
@@ -394,7 +396,7 @@ func (s *Server) RegionHeartbeat(stream pdpb.PD_RegionHeartbeatServer) error {
 
 		region := core.RegionFromHeartbeat(request)
 		if region.GetLeader() == nil {
-			log.Error("invalid request, the leader is nil", zap.Reflect("reqeust", request), zap.Error(errs.ErrHeartBeatLeaderNil.FastGenByArgs()))
+			log.Error("invalid request, the leader is nil", zap.Reflect("reqeust", request), errs.ZapError(errs.ErrHeartBeatLeaderNil))
 			continue
 		}
 		if region.GetID() == 0 {
@@ -552,7 +554,7 @@ func (s *Server) AskBatchSplit(ctx context.Context, request *pdpb.AskBatchSplitR
 		return &pdpb.AskBatchSplitResponse{Header: s.notBootstrappedHeader()}, nil
 	}
 
-	if !rc.IsFeatureSupported(cluster.BatchSplit) {
+	if !rc.IsFeatureSupported(versioninfo.BatchSplit) {
 		return &pdpb.AskBatchSplitResponse{Header: s.incompatibleVersion("batch_split")}, nil
 	}
 	if request.GetRegion() == nil {
@@ -775,7 +777,12 @@ func (s *Server) UpdateServiceGCSafePoint(ctx context.Context, request *pdpb.Upd
 		}
 	}
 
-	min, err := s.storage.LoadMinServiceGCSafePoint()
+	nowTSO, err := s.tsoAllocator.GenerateTSO(1)
+	if err != nil {
+		return nil, err
+	}
+	now, _ := tsoutil.ParseTimestamp(nowTSO)
+	min, err := s.storage.LoadMinServiceGCSafePoint(now)
 	if err != nil {
 		return nil, err
 	}
@@ -783,7 +790,7 @@ func (s *Server) UpdateServiceGCSafePoint(ctx context.Context, request *pdpb.Upd
 	if request.TTL > 0 && request.SafePoint >= min.SafePoint {
 		ssp := &core.ServiceSafePoint{
 			ServiceID: string(request.ServiceId),
-			ExpiredAt: time.Now().Unix() + request.TTL,
+			ExpiredAt: now.Unix() + request.TTL,
 			SafePoint: request.SafePoint,
 		}
 		if err := s.storage.SaveServiceGCSafePoint(ssp); err != nil {
@@ -795,7 +802,7 @@ func (s *Server) UpdateServiceGCSafePoint(ctx context.Context, request *pdpb.Upd
 			zap.Uint64("safepoint", ssp.SafePoint))
 		// If the min safepoint is updated, load the next one
 		if string(request.ServiceId) == min.ServiceID {
-			min, err = s.storage.LoadMinServiceGCSafePoint()
+			min, err = s.storage.LoadMinServiceGCSafePoint(now)
 			if err != nil {
 				return nil, err
 			}
@@ -809,7 +816,7 @@ func (s *Server) UpdateServiceGCSafePoint(ctx context.Context, request *pdpb.Upd
 	return &pdpb.UpdateServiceGCSafePointResponse{
 		Header:       s.header(),
 		ServiceId:    []byte(min.ServiceID),
-		TTL:          min.ExpiredAt - time.Now().Unix(),
+		TTL:          min.ExpiredAt - now.Unix(),
 		MinSafePoint: min.SafePoint,
 	}, nil
 }
diff --git a/server/handler.go b/server/handler.go
index a8fea3a603a..81986dac7d5 100644
--- a/server/handler.go
+++ b/server/handler.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,21 +24,20 @@ import (
 	"time"
 
 	"github.com/pingcap/errcode"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/errs"
-	"github.com/pingcap/pd/v4/server/cluster"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
-	"github.com/pingcap/pd/v4/server/schedulers"
-	"github.com/pingcap/pd/v4/server/statistics"
-	"github.com/pkg/errors"
-	"github.com/sasha-s/go-deadlock"
+	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/server/cluster"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedule/storelimit"
+	"github.com/tikv/pd/server/schedulers"
+	"github.com/tikv/pd/server/statistics"
 	"go.uber.org/zap"
 )
 
@@ -211,9 +210,9 @@ func (h *Handler) AddScheduler(name string, args ...string) error {
 	}
 	log.Info("create scheduler", zap.String("scheduler-name", s.GetName()))
 	if err = c.AddScheduler(s, args...); err != nil {
-		log.Error("can not add scheduler", zap.Error(errs.ErrSchedulerOperation.FastGenByArgs(s.GetName())), zap.NamedError("cause", err))
+		log.Error("can not add scheduler", zap.String("scheduler-name", s.GetName()), errs.ZapError(errs.ErrSchedulerOperation, err))
 	} else if err = h.opt.Persist(c.GetStorage()); err != nil {
-		log.Error("can not persist scheduler config", zap.Error(errs.ErrSavePersistOptions), zap.NamedError("cause", err))
+		log.Error("can not persist scheduler config", errs.ZapError(errs.ErrSavePersistOptions, err))
 	}
 	return err
 }
@@ -225,7 +224,7 @@ func (h *Handler) RemoveScheduler(name string) error {
 		return err
 	}
 	if err = c.RemoveScheduler(name); err != nil {
-		log.Error("can not remove scheduler", zap.Error(errs.ErrSchedulerOperation.FastGenByArgs(name)), zap.NamedError("cause", err))
+		log.Error("can not remove scheduler", zap.String("scheduler-name", name), errs.ZapError(errs.ErrSchedulerOperation, err))
 	}
 	return err
 }
@@ -240,9 +239,9 @@ func (h *Handler) PauseOrResumeScheduler(name string, t int64) error {
 	}
 	if err = c.PauseOrResumeScheduler(name, t); err != nil {
 		if t == 0 {
-			log.Error("can not resume scheduler", zap.Error(errs.ErrSchedulerOperation.FastGenByArgs(name)), zap.NamedError("cause", err))
+			log.Error("can not resume scheduler", zap.String("scheduler-name", name), errs.ZapError(errs.ErrSchedulerOperation, err))
 		} else {
-			log.Error("can not pause scheduler", zap.Error(errs.ErrSchedulerOperation.FastGenByArgs(name)), zap.NamedError("cause", err))
+			log.Error("can not pause scheduler", zap.String("scheduler-name", name), errs.ZapError(errs.ErrSchedulerOperation, err))
 		}
 	}
 	return err
@@ -541,7 +540,7 @@ func (h *Handler) AddTransferPeerOperator(regionID uint64, fromStoreID, toStoreI
 		return errcode.Op("operator.add").AddTo(core.StoreTombstonedErr{StoreID: toStoreID})
 	}
 
-	newPeer := &metapb.Peer{StoreId: toStoreID, IsLearner: oldPeer.GetIsLearner()}
+	newPeer := &metapb.Peer{StoreId: toStoreID, Role: oldPeer.GetRole()}
 	op, err := operator.CreateMovePeerOperator("admin-move-peer", c, region, operator.OpAdmin, fromStoreID, newPeer)
 	if err != nil {
 		log.Debug("fail to create move peer operator", zap.Error(err))
@@ -607,8 +606,8 @@ func (h *Handler) AddAddLearnerOperator(regionID uint64, toStoreID uint64) error
 	}
 
 	newPeer := &metapb.Peer{
-		StoreId:   toStoreID,
-		IsLearner: true,
+		StoreId: toStoreID,
+		Role:    metapb.PeerRole_Learner,
 	}
 
 	op, err := operator.CreateAddPeerOperator("admin-add-learner", c, region, newPeer, operator.OpAdmin)
@@ -827,11 +826,11 @@ func (h *Handler) GetEmptyRegion() ([]*core.RegionInfo, error) {
 
 // ResetTS resets the ts with specified tso.
 func (h *Handler) ResetTS(ts uint64) error {
-	tsoServer := h.s.tso
-	if tsoServer == nil {
+	tsoAllocator := h.s.tsoAllocator
+	if tsoAllocator == nil {
 		return ErrServerNotStarted
 	}
-	return tsoServer.ResetUserTimestamp(ts)
+	return tsoAllocator.SetTSO(ts)
 }
 
 // SetStoreLimitScene sets the limit values for differents scenes
diff --git a/server/heartbeat_stream_test.go b/server/heartbeat_stream_test.go
index 2b105cfb29e..42b982524f7 100644
--- a/server/heartbeat_stream_test.go
+++ b/server/heartbeat_stream_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/core"
 	"go.uber.org/zap"
 )
 
@@ -48,7 +48,7 @@ func (s *testHeartbeatStreamSuite) TestActivity(c *C) {
 	bootstrapReq := &pdpb.BootstrapRequest{
 		Header: testutil.NewRequestHeader(s.svr.clusterID),
 		Store:  &metapb.Store{Id: 1, Address: "127.0.0.1:0"},
-		Region: &metapb.Region{Id: 2, Peers: []*metapb.Peer{{Id: 3, StoreId: 1, IsLearner: false}}},
+		Region: &metapb.Region{Id: 2, Peers: []*metapb.Peer{{Id: 3, StoreId: 1, Role: metapb.PeerRole_Voter}}},
 	}
 	_, err = s.svr.bootstrapCluster(bootstrapReq)
 	c.Assert(err, IsNil)
diff --git a/server/heartbeat_streams.go b/server/heartbeat_streams.go
index e7d34490ce1..91db4a8304d 100644
--- a/server/heartbeat_streams.go
+++ b/server/heartbeat_streams.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/errs"
-	"github.com/pingcap/pd/v4/pkg/logutil"
-	"github.com/pingcap/pd/v4/server/cluster"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/logutil"
+	"github.com/tikv/pd/server/cluster"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/opt"
 	"go.uber.org/zap"
 )
 
@@ -88,7 +88,8 @@ func (s *heartbeatStreams) run() {
 			if store == nil {
 				log.Error("failed to get store",
 					zap.Uint64("region-id", msg.RegionId),
-					zap.Error(errs.ErrInternalStoreNotFound.FastGenByArgs(storeID)))
+					zap.Uint64("store-id", storeID),
+					errs.ZapError(errs.ErrStoreNotFound))
 				delete(s.streams, storeID)
 				continue
 			}
@@ -96,7 +97,7 @@ func (s *heartbeatStreams) run() {
 			if stream, ok := s.streams[storeID]; ok {
 				if err := stream.Send(msg); err != nil {
 					log.Error("send heartbeat message fail",
-						zap.Uint64("region-id", msg.RegionId), zap.Error(errs.ErrGRPCHeartbeat))
+						zap.Uint64("region-id", msg.RegionId), errs.ZapError(errs.ErrGRPCHeartbeat, err))
 					delete(s.streams, storeID)
 					regionHeartbeatCounter.WithLabelValues(storeAddress, storeLabel, "push", "err").Inc()
 				} else {
@@ -112,7 +113,7 @@ func (s *heartbeatStreams) run() {
 			for storeID, stream := range s.streams {
 				store := s.cluster.GetStore(storeID)
 				if store == nil {
-					log.Error("failed to get store", zap.Error(errs.ErrInternalStoreNotFound.FastGenByArgs(storeID)))
+					log.Error("failed to get store", zap.Uint64("store-id", storeID), errs.ZapError(errs.ErrStoreNotFound))
 					delete(s.streams, storeID)
 					continue
 				}
diff --git a/server/id/id.go b/server/id/id.go
index fef22f2fc67..35b9aa19455 100644
--- a/server/id/id.go
+++ b/server/id/id.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@ import (
 	"path"
 	"sync"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server/kv"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/kv"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
 )
diff --git a/server/id/metrics.go b/server/id/metrics.go
index 9287de2a8b8..1540028de00 100644
--- a/server/id/metrics.go
+++ b/server/id/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/join/join.go b/server/join/join.go
index f230d5ef1c7..b34d73c19a6 100644
--- a/server/join/join.go
+++ b/server/join/join.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/server/config"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/embed"
 	"go.uber.org/zap"
diff --git a/server/join/join_test.go b/server/join/join_test.go
index 39f8309ec11..f71e4e202f4 100644
--- a/server/join/join_test.go
+++ b/server/join/join_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ import (
 	"testing"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
 )
 
 func TestJoin(t *testing.T) {
diff --git a/server/kv/etcd_kv.go b/server/kv/etcd_kv.go
index 743e851d723..74caef41539 100644
--- a/server/kv/etcd_kv.go
+++ b/server/kv/etcd_kv.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,9 +19,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/etcdutil"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
 )
@@ -64,8 +65,12 @@ func (kv *etcdKVBase) Load(key string) (string, error) {
 }
 
 func (kv *etcdKVBase) LoadRange(key, endKey string, limit int) ([]string, []string, error) {
-	key = path.Join(kv.rootPath, key)
-	endKey = path.Join(kv.rootPath, endKey)
+	// Note: reason to use `strings.Join` instead of `path.Join` is that the latter will
+	// removes suffix '/' of the joined string.
+	// As a result, when we try to scan from "foo/", it ends up scanning from "/pd/foo"
+	// internally, and returns unexpected keys such as "foo_bar/baz".
+	key = strings.Join([]string{kv.rootPath, key}, "/")
+	endKey = strings.Join([]string{kv.rootPath, endKey}, "/")
 
 	withRange := clientv3.WithRange(endKey)
 	withLimit := clientv3.WithLimit(int64(limit))
@@ -88,7 +93,7 @@ func (kv *etcdKVBase) Save(key, value string) error {
 	txn := NewSlowLogTxn(kv.client)
 	resp, err := txn.Then(clientv3.OpPut(key, value)).Commit()
 	if err != nil {
-		log.Error("save to etcd meet error", zap.Error(err))
+		log.Error("save to etcd meet error", zap.String("key", key), zap.String("value", value), errs.ZapError(errs.ErrEtcdKVSave, err))
 		return errors.WithStack(err)
 	}
 	if !resp.Succeeded {
@@ -103,7 +108,7 @@ func (kv *etcdKVBase) Remove(key string) error {
 	txn := NewSlowLogTxn(kv.client)
 	resp, err := txn.Then(clientv3.OpDelete(key)).Commit()
 	if err != nil {
-		log.Error("remove from etcd meet error", zap.Error(err))
+		log.Error("remove from etcd meet error", zap.String("key", key), errs.ZapError(errs.ErrEtcdKVRemove, err))
 		return errors.WithStack(err)
 	}
 	if !resp.Succeeded {
diff --git a/server/kv/etcd_kv_test.go b/server/kv/etcd_kv_test.go
deleted file mode 100644
index c5c2cfb987e..00000000000
--- a/server/kv/etcd_kv_test.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2017 PingCAP, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//	   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package kv
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"path"
-	"strconv"
-	"testing"
-
-	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/pkg/tempurl"
-	"go.etcd.io/etcd/clientv3"
-	"go.etcd.io/etcd/embed"
-)
-
-func TestKV(t *testing.T) {
-	TestingT(t)
-}
-
-type testEtcdKVSuite struct{}
-
-var _ = Suite(&testEtcdKVSuite{})
-
-func (s *testEtcdKVSuite) TestEtcdKV(c *C) {
-	cfg := newTestSingleConfig()
-	etcd, err := embed.StartEtcd(cfg)
-	c.Assert(err, IsNil)
-
-	ep := cfg.LCUrls[0].String()
-	client, err := clientv3.New(clientv3.Config{
-		Endpoints: []string{ep},
-	})
-	c.Assert(err, IsNil)
-	rootPath := path.Join("/pd", strconv.FormatUint(100, 10))
-
-	kv := NewEtcdKVBase(client, rootPath)
-
-	keys := []string{"test/key1", "test/key2", "test/key3", "test/key4", "test/key5"}
-	vals := []string{"val1", "val2", "val3", "val4", "val5"}
-
-	v, err := kv.Load(keys[0])
-	c.Assert(err, IsNil)
-	c.Assert(v, Equals, "")
-
-	for i := range keys {
-		err = kv.Save(keys[i], vals[i])
-		c.Assert(err, IsNil)
-	}
-	for i := range keys {
-		v, err = kv.Load(keys[i])
-		c.Assert(err, IsNil)
-		c.Assert(v, Equals, vals[i])
-	}
-	ks, vs, err := kv.LoadRange(keys[0], "test/zzz", 100)
-	c.Assert(err, IsNil)
-	c.Assert(ks, DeepEquals, keys)
-	c.Assert(vs, DeepEquals, vals)
-	ks, vs, err = kv.LoadRange(keys[0], "test/zzz", 3)
-	c.Assert(err, IsNil)
-	c.Assert(ks, DeepEquals, keys[:3])
-	c.Assert(vs, DeepEquals, vals[:3])
-	ks, vs, err = kv.LoadRange(keys[0], keys[3], 100)
-	c.Assert(err, IsNil)
-	c.Assert(ks, DeepEquals, keys[:3])
-	c.Assert(vs, DeepEquals, vals[:3])
-
-	v, err = kv.Load(keys[1])
-	c.Assert(err, IsNil)
-	c.Assert(v, Equals, "val2")
-	c.Assert(kv.Remove(keys[1]), IsNil)
-	v, err = kv.Load(keys[1])
-	c.Assert(err, IsNil)
-	c.Assert(v, Equals, "")
-
-	etcd.Close()
-	cleanConfig(cfg)
-}
-
-func newTestSingleConfig() *embed.Config {
-	cfg := embed.NewConfig()
-	cfg.Name = "test_etcd"
-	cfg.Dir, _ = ioutil.TempDir("/tmp", "test_etcd")
-	cfg.WalDir = ""
-	cfg.Logger = "zap"
-	cfg.LogOutputs = []string{"stdout"}
-
-	pu, _ := url.Parse(tempurl.Alloc())
-	cfg.LPUrls = []url.URL{*pu}
-	cfg.APUrls = cfg.LPUrls
-	cu, _ := url.Parse(tempurl.Alloc())
-	cfg.LCUrls = []url.URL{*cu}
-	cfg.ACUrls = cfg.LCUrls
-
-	cfg.StrictReconfigCheck = false
-	cfg.InitialCluster = fmt.Sprintf("%s=%s", cfg.Name, &cfg.LPUrls[0])
-	cfg.ClusterState = embed.ClusterStateFlagNew
-	return cfg
-}
-
-func cleanConfig(cfg *embed.Config) {
-	// Clean data directory
-	os.RemoveAll(cfg.Dir)
-}
diff --git a/server/kv/kv.go b/server/kv/kv.go
index 768eb7036f1..e08ada747dc 100644
--- a/server/kv/kv.go
+++ b/server/kv/kv.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/kv/kv_test.go b/server/kv/kv_test.go
new file mode 100644
index 00000000000..56573fea0a0
--- /dev/null
+++ b/server/kv/kv_test.go
@@ -0,0 +1,153 @@
+// Copyright 2017 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package kv
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/url"
+	"os"
+	"path"
+	"sort"
+	"strconv"
+	"testing"
+
+	. "github.com/pingcap/check"
+	"github.com/tikv/pd/pkg/tempurl"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/embed"
+)
+
+func TestKV(t *testing.T) {
+	TestingT(t)
+}
+
+type testKVSuite struct{}
+
+var _ = Suite(&testKVSuite{})
+
+func (s *testKVSuite) TestEtcd(c *C) {
+	cfg := newTestSingleConfig()
+	defer cleanConfig(cfg)
+	etcd, err := embed.StartEtcd(cfg)
+	c.Assert(err, IsNil)
+	defer etcd.Close()
+
+	ep := cfg.LCUrls[0].String()
+	client, err := clientv3.New(clientv3.Config{
+		Endpoints: []string{ep},
+	})
+	c.Assert(err, IsNil)
+	rootPath := path.Join("/pd", strconv.FormatUint(100, 10))
+
+	kv := NewEtcdKVBase(client, rootPath)
+	s.testReadWrite(c, kv)
+	s.testRange(c, kv)
+}
+
+func (s *testKVSuite) TestLevelDB(c *C) {
+	dir, err := ioutil.TempDir("/tmp", "leveldb_kv")
+	c.Assert(err, IsNil)
+	defer os.RemoveAll(dir)
+	kv, err := NewLeveldbKV(dir)
+	c.Assert(err, IsNil)
+
+	s.testReadWrite(c, kv)
+	s.testRange(c, kv)
+}
+
+func (s *testKVSuite) TestMemkv(c *C) {
+	kv := NewMemoryKV()
+	s.testReadWrite(c, kv)
+	s.testRange(c, kv)
+}
+
+func (s *testKVSuite) testReadWrite(c *C, kv Base) {
+	v, err := kv.Load("key")
+	c.Assert(err, IsNil)
+	c.Assert(v, Equals, "")
+	err = kv.Save("key", "value")
+	c.Assert(err, IsNil)
+	v, err = kv.Load("key")
+	c.Assert(err, IsNil)
+	c.Assert(v, Equals, "value")
+	err = kv.Remove("key")
+	c.Assert(err, IsNil)
+	v, err = kv.Load("key")
+	c.Assert(err, IsNil)
+	c.Assert(v, Equals, "")
+	err = kv.Remove("key")
+	c.Assert(err, IsNil)
+}
+
+func (s *testKVSuite) testRange(c *C, kv Base) {
+	keys := []string{
+		"test-a", "test-a/a", "test-a/ab",
+		"test", "test/a", "test/ab",
+		"testa", "testa/a", "testa/ab",
+	}
+	for _, k := range keys {
+		err := kv.Save(k, k)
+		c.Assert(err, IsNil)
+	}
+	sortedKeys := append(keys[:0:0], keys...)
+	sort.Strings(sortedKeys)
+
+	testCases := []struct {
+		start, end string
+		limit      int
+		expect     []string
+	}{
+		{start: "", end: "z", limit: 100, expect: sortedKeys},
+		{start: "", end: "z", limit: 3, expect: sortedKeys[:3]},
+		{start: "testa", end: "z", limit: 3, expect: []string{"testa", "testa/a", "testa/ab"}},
+		{start: "test/", end: clientv3.GetPrefixRangeEnd("test/"), limit: 100, expect: []string{"test/a", "test/ab"}},
+		{start: "test-a/", end: clientv3.GetPrefixRangeEnd("test-a/"), limit: 100, expect: []string{"test-a/a", "test-a/ab"}},
+		{start: "test", end: clientv3.GetPrefixRangeEnd("test"), limit: 100, expect: sortedKeys},
+		{start: "test", end: clientv3.GetPrefixRangeEnd("test/"), limit: 100, expect: []string{"test", "test-a", "test-a/a", "test-a/ab", "test/a", "test/ab"}},
+	}
+
+	for _, tc := range testCases {
+		ks, vs, err := kv.LoadRange(tc.start, tc.end, tc.limit)
+		c.Assert(err, IsNil)
+		c.Assert(ks, DeepEquals, tc.expect)
+		c.Assert(vs, DeepEquals, tc.expect)
+	}
+}
+
+func newTestSingleConfig() *embed.Config {
+	cfg := embed.NewConfig()
+	cfg.Name = "test_etcd"
+	cfg.Dir, _ = ioutil.TempDir("/tmp", "test_etcd")
+	cfg.WalDir = ""
+	cfg.Logger = "zap"
+	cfg.LogOutputs = []string{"stdout"}
+
+	pu, _ := url.Parse(tempurl.Alloc())
+	cfg.LPUrls = []url.URL{*pu}
+	cfg.APUrls = cfg.LPUrls
+	cu, _ := url.Parse(tempurl.Alloc())
+	cfg.LCUrls = []url.URL{*cu}
+	cfg.ACUrls = cfg.LCUrls
+
+	cfg.StrictReconfigCheck = false
+	cfg.InitialCluster = fmt.Sprintf("%s=%s", cfg.Name, &cfg.LPUrls[0])
+	cfg.ClusterState = embed.ClusterStateFlagNew
+	return cfg
+}
+
+func cleanConfig(cfg *embed.Config) {
+	// Clean data directory
+	os.RemoveAll(cfg.Dir)
+}
diff --git a/server/kv/levedb_kv.go b/server/kv/levedb_kv.go
index f786a125974..c73e5a4722e 100644
--- a/server/kv/levedb_kv.go
+++ b/server/kv/levedb_kv.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@ package kv
 
 import (
 	"github.com/gogo/protobuf/proto"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pkg/errors"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/util"
 )
@@ -39,6 +39,9 @@ func NewLeveldbKV(path string) (*LeveldbKV, error) {
 func (kv *LeveldbKV) Load(key string) (string, error) {
 	v, err := kv.Get([]byte(key), nil)
 	if err != nil {
+		if err == leveldb.ErrNotFound {
+			return "", nil
+		}
 		return "", errors.WithStack(err)
 	}
 	return string(v), err
diff --git a/server/kv/mem_kv.go b/server/kv/mem_kv.go
index 461991d33f9..954f3d7ad3a 100644
--- a/server/kv/mem_kv.go
+++ b/server/kv/mem_kv.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/kv/metrics.go b/server/kv/metrics.go
index 3ce2313f1c5..4603d85383c 100644
--- a/server/kv/metrics.go
+++ b/server/kv/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/member/leader.go b/server/member/member.go
similarity index 69%
rename from server/member/leader.go
rename to server/member/member.go
index 62dc824c430..fee07c00011 100644
--- a/server/member/leader.go
+++ b/server/member/member.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,13 +26,15 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/kv"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/election"
+	"github.com/tikv/pd/server/kv"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/embed"
 	"go.etcd.io/etcd/mvcc/mvccpb"
@@ -42,31 +44,31 @@ import (
 const (
 	// The timeout to wait transfer etcd leader to complete.
 	moveLeaderTimeout = 5 * time.Second
-	requestTimeout    = etcdutil.DefaultRequestTimeout
-	slowRequestTime   = etcdutil.DefaultSlowRequestTime
 )
 
 // Member is used for the election related logic.
 type Member struct {
-	leader atomic.Value
-	// Etcd and cluster information.
+	Leadership *election.Leadership
+	leader     atomic.Value // stored as *pdpb.Member
+	// etcd and cluster information.
 	etcd     *embed.Etcd
 	client   *clientv3.Client
 	id       uint64       // etcd server id.
 	member   *pdpb.Member // current PD's info.
 	rootPath string
 	// memberValue is the serialized string of `member`. It will be save in
-	// etcd leader key when the PD node is successfully elected as the leader
-	// of the cluster. Every write will use it to check leadership.
+	// etcd leader key when the PD node is successfully elected as the PD leader
+	// of the cluster. Every write will use it to check PD leadership.
 	memberValue string
 }
 
 // NewMember create a new Member.
 func NewMember(etcd *embed.Etcd, client *clientv3.Client, id uint64) *Member {
 	return &Member{
-		etcd:   etcd,
-		client: client,
-		id:     id,
+		Leadership: election.NewLeadership(client, "pd leader election"),
+		etcd:       etcd,
+		client:     client,
+		id:         id,
 	}
 }
 
@@ -90,18 +92,18 @@ func (m *Member) Etcd() *embed.Etcd {
 	return m.etcd
 }
 
-// IsLeader returns whether the server is leader or not.
+// IsLeader returns whether the server is PD leader or not.
 func (m *Member) IsLeader() bool {
 	// If server is not started. Both leaderID and ID could be 0.
 	return m.GetLeaderID() == m.ID()
 }
 
-// GetLeaderID returns current leader's member ID.
+// GetLeaderID returns current PD leader's member ID.
 func (m *Member) GetLeaderID() uint64 {
 	return m.GetLeader().GetMemberId()
 }
 
-// GetLeader returns current leader of PD cluster.
+// GetLeader returns current PD leader of PD cluster.
 func (m *Member) GetLeader() *pdpb.Member {
 	leader := m.leader.Load()
 	if leader == nil {
@@ -114,17 +116,17 @@ func (m *Member) GetLeader() *pdpb.Member {
 	return member
 }
 
-// EnableLeader sets the member to leader.
+// EnableLeader sets the member to PD leader.
 func (m *Member) EnableLeader() {
 	m.leader.Store(m.member)
 }
 
-// DisableLeader reset the leader value.
+// DisableLeader reset the PD leader value.
 func (m *Member) DisableLeader() {
 	m.leader.Store(&pdpb.Member{})
 }
 
-// GetLeaderPath returns the path of the leader.
+// GetLeaderPath returns the path of the PD leader.
 func (m *Member) GetLeaderPath() string {
 	return path.Join(m.rootPath, "leader")
 }
@@ -132,24 +134,24 @@ func (m *Member) GetLeaderPath() string {
 // CheckLeader checks returns true if it is needed to check later.
 func (m *Member) CheckLeader(name string) (*pdpb.Member, int64, bool) {
 	if m.GetEtcdLeader() == 0 {
-		log.Error("no etcd leader, check leader later")
+		log.Error("no etcd leader, check pd leader later", zap.Error(errs.ErretcdLeaderNotFound.FastGenByArgs()))
 		time.Sleep(200 * time.Millisecond)
 		return nil, 0, true
 	}
 
-	leader, rev, err := getLeader(m.client, m.GetLeaderPath())
+	leader, rev, err := election.GetLeader(m.client, m.GetLeaderPath())
 	if err != nil {
-		log.Error("get leader meet error", zap.Error(err))
+		log.Error("getting pd leader meets error", errs.ZapError(errs.ErrGetLeader, err))
 		time.Sleep(200 * time.Millisecond)
 		return nil, 0, true
 	}
 	if leader != nil {
 		if m.isSameLeader(leader) {
-			// oh, we are already leader, we may meet something wrong
-			// in previous CampaignLeader. we can delete and campaign again.
-			log.Warn("the leader has not changed, delete and campaign again", zap.Stringer("old-leader", leader))
-			if err = m.deleteLeaderKey(); err != nil {
-				log.Error("delete leader key meet error", zap.Error(err))
+			// oh, we are already a PD leader, which indicates we may meet something wrong
+			// in previous CampaignLeader. We should delete the leadership and campaign again.
+			log.Warn("the pd leader has not changed, delete and campaign again", zap.Stringer("old-pd-leader", leader))
+			if err = m.Leadership.DeleteLeader(); err != nil {
+				log.Error("deleting pd leader key meets error", errs.ZapError(errs.ErrDeleteLeaderKey, err))
 				time.Sleep(200 * time.Millisecond)
 				return nil, 0, true
 			}
@@ -158,7 +160,7 @@ func (m *Member) CheckLeader(name string) (*pdpb.Member, int64, bool) {
 	return leader, rev, false
 }
 
-// CheckPriority if the leader will be moved according to the priority.
+// CheckPriority checks whether the etcd leader should be moved according to the priority.
 func (m *Member) CheckPriority(ctx context.Context) {
 	etcdLeader := m.GetEtcdLeader()
 	if etcdLeader == m.ID() || etcdLeader == 0 {
@@ -166,18 +168,18 @@ func (m *Member) CheckPriority(ctx context.Context) {
 	}
 	myPriority, err := m.GetMemberLeaderPriority(m.ID())
 	if err != nil {
-		log.Error("failed to load leader priority", zap.Error(err))
+		log.Error("failed to load etcd leader priority", errs.ZapError(errs.ErrLoadLeaderPriority, err))
 		return
 	}
 	leaderPriority, err := m.GetMemberLeaderPriority(etcdLeader)
 	if err != nil {
-		log.Error("failed to load etcd leader priority", zap.Error(err))
+		log.Error("failed to load etcd leader priority", errs.ZapError(errs.ErrLoadetcdLeaderPriority, err))
 		return
 	}
 	if myPriority > leaderPriority {
 		err := m.MoveEtcdLeader(ctx, etcdLeader, m.ID())
 		if err != nil {
-			log.Error("failed to transfer etcd leader", zap.Error(err))
+			log.Error("failed to transfer etcd leader", errs.ZapError(errs.ErrTransferetcdLeader, err))
 		} else {
 			log.Info("transfer etcd leader",
 				zap.Uint64("from", etcdLeader),
@@ -193,25 +195,12 @@ func (m *Member) MoveEtcdLeader(ctx context.Context, old, new uint64) error {
 	return errors.WithStack(m.etcd.Server.MoveLeader(moveCtx, old, new))
 }
 
-// getLeader gets server leader from etcd.
-func getLeader(c *clientv3.Client, leaderPath string) (*pdpb.Member, int64, error) {
-	leader := &pdpb.Member{}
-	ok, rev, err := etcdutil.GetProtoMsgWithModRev(c, leaderPath, leader)
-	if err != nil {
-		return nil, 0, err
-	}
-	if !ok {
-		return nil, 0, nil
-	}
-
-	return leader, rev, nil
-}
-
 // GetEtcdLeader returns the etcd leader ID.
 func (m *Member) GetEtcdLeader() uint64 {
 	return m.etcd.Server.Lead()
 }
 
+// isSameLeader checks whether a server is the leader itself.
 func (m *Member) isSameLeader(leader *pdpb.Member) bool {
 	return leader.GetMemberId() == m.ID()
 }
@@ -228,62 +217,33 @@ func (m *Member) MemberInfo(cfg *config.Config, name string, rootPath string) {
 	data, err := leader.Marshal()
 	if err != nil {
 		// can't fail, so panic here.
-		log.Fatal("marshal leader meet error", zap.Stringer("leader", leader), zap.Error(err))
+		log.Fatal("marshal pd leader meet error", zap.Stringer("pd-leader", leader), errs.ZapError(errs.ErrMarshalLeader, err))
 	}
 	m.member = leader
 	m.memberValue = string(data)
 	m.rootPath = rootPath
 }
 
-// CampaignLeader is used to campaign the leader.
-func (m *Member) CampaignLeader(lease *LeaderLease, leaseTimeout int64) error {
-	err := lease.Grant(leaseTimeout)
-	if err != nil {
-		return err
-	}
-
-	leaderKey := m.GetLeaderPath()
-	// The leader key must not exist, so the CreateRevision is 0.
-	resp, err := kv.NewSlowLogTxn(m.client).
-		If(clientv3.Compare(clientv3.CreateRevision(leaderKey), "=", 0)).
-		Then(clientv3.OpPut(leaderKey, m.memberValue, clientv3.WithLease(lease.ID))).
-		Commit()
-	if err != nil {
-		return errs.ErrEtcdLeaderSave.FastGenByArgs()
-	}
-	if !resp.Succeeded {
-		return errs.ErrCampaignLeader.FastGenByArgs()
-	}
-	return nil
-}
-
-// ResignLeader resigns current PD's leadership. If nextLeader is empty, all
+// ResignEtcdLeader resigns current PD's etcd leadership. If nextLeader is empty, all
 // other pd-servers can campaign.
-func (m *Member) ResignLeader(ctx context.Context, from string, nextLeader string) error {
-	log.Info("try to resign leader to next leader", zap.String("from", from), zap.String("to", nextLeader))
-	// Determine next leaders.
-	var leaderIDs []uint64
+func (m *Member) ResignEtcdLeader(ctx context.Context, from string, nextEtcdLeader string) error {
+	log.Info("try to resign etcd leader to next pd-server", zap.String("from", from), zap.String("to", nextEtcdLeader))
+	// Determine next etcd leader candidates.
+	var etcdLeaderIDs []uint64
 	res, err := etcdutil.ListEtcdMembers(m.client)
 	if err != nil {
 		return err
 	}
 	for _, member := range res.Members {
-		if (nextLeader == "" && member.ID != m.id) || (nextLeader != "" && member.Name == nextLeader) {
-			leaderIDs = append(leaderIDs, member.GetID())
+		if (nextEtcdLeader == "" && member.ID != m.id) || (nextEtcdLeader != "" && member.Name == nextEtcdLeader) {
+			etcdLeaderIDs = append(etcdLeaderIDs, member.GetID())
 		}
 	}
-	if len(leaderIDs) == 0 {
-		return errors.New("no valid pd to transfer leader")
+	if len(etcdLeaderIDs) == 0 {
+		return errors.New("no valid pd to transfer etcd leader")
 	}
-	nextLeaderID := leaderIDs[rand.Intn(len(leaderIDs))]
-	return m.MoveEtcdLeader(ctx, m.ID(), nextLeaderID)
-}
-
-// LeaderTxn returns txn() with a leader comparison to guarantee that
-// the transaction can be executed only if the server is leader.
-func (m *Member) LeaderTxn(cs ...clientv3.Cmp) clientv3.Txn {
-	txn := kv.NewSlowLogTxn(m.client)
-	return txn.If(append(cs, m.leaderCmp())...)
+	nextEtcdLeaderID := etcdLeaderIDs[rand.Intn(len(etcdLeaderIDs))]
+	return m.MoveEtcdLeader(ctx, m.ID(), nextEtcdLeaderID)
 }
 
 func (m *Member) getMemberLeaderPriorityPath(id uint64) string {
@@ -293,7 +253,7 @@ func (m *Member) getMemberLeaderPriorityPath(id uint64) string {
 // SetMemberLeaderPriority saves a member's priority to be elected as the etcd leader.
 func (m *Member) SetMemberLeaderPriority(id uint64, priority int) error {
 	key := m.getMemberLeaderPriorityPath(id)
-	res, err := m.LeaderTxn().Then(clientv3.OpPut(key, strconv.Itoa(priority))).Commit()
+	res, err := m.Leadership.LeaderTxn().Then(clientv3.OpPut(key, strconv.Itoa(priority))).Commit()
 	if err != nil {
 		return errors.WithStack(err)
 	}
@@ -303,15 +263,15 @@ func (m *Member) SetMemberLeaderPriority(id uint64, priority int) error {
 	return nil
 }
 
-// DeleteMemberLeaderPriority removes a member's priority config.
+// DeleteMemberLeaderPriority removes a member's ectd leader priority config.
 func (m *Member) DeleteMemberLeaderPriority(id uint64) error {
 	key := m.getMemberLeaderPriorityPath(id)
-	res, err := m.LeaderTxn().Then(clientv3.OpDelete(key)).Commit()
+	res, err := m.Leadership.LeaderTxn().Then(clientv3.OpDelete(key)).Commit()
 	if err != nil {
 		return errors.WithStack(err)
 	}
 	if !res.Succeeded {
-		return errors.New("delete leader priority failed, maybe not leader")
+		return errors.New("delete etcd leader priority failed, maybe not pd leader")
 	}
 	return nil
 }
@@ -431,24 +391,6 @@ func (m *Member) SetMemberGitHash(id uint64, gitHash string) error {
 	return nil
 }
 
-func (m *Member) deleteLeaderKey() error {
-	// delete leader itself and let others start a new election again.
-	leaderKey := m.GetLeaderPath()
-	resp, err := m.LeaderTxn().Then(clientv3.OpDelete(leaderKey)).Commit()
-	if err != nil {
-		return errors.WithStack(err)
-	}
-	if !resp.Succeeded {
-		return errors.New("resign leader failed, we are not leader already")
-	}
-
-	return nil
-}
-
-func (m *Member) leaderCmp() clientv3.Cmp {
-	return clientv3.Compare(clientv3.Value(m.GetLeaderPath()), "=", m.memberValue)
-}
-
 // WatchLeader is used to watch the changes of the leader.
 func (m *Member) WatchLeader(serverCtx context.Context, leader *pdpb.Member, revision int64) {
 	m.leader.Store(leader)
@@ -476,13 +418,13 @@ func (m *Member) WatchLeader(serverCtx context.Context, leader *pdpb.Member, rev
 				break
 			}
 			if wresp.Canceled {
-				log.Error("leader watcher is canceled with", zap.Int64("revision", revision), zap.Error(wresp.Err()))
+				log.Error("pd leader watcher is canceled with", zap.Int64("revision", revision), errs.ZapError(errs.ErrWatcherCancel, wresp.Err()))
 				return
 			}
 
 			for _, ev := range wresp.Events {
 				if ev.Type == mvccpb.DELETE {
-					log.Info("leader is deleted")
+					log.Info("current pd leader is deleted")
 					return
 				}
 			}
diff --git a/server/metrics.go b/server/metrics.go
index c4cc96babc9..bfbfc9935ca 100644
--- a/server/metrics.go
+++ b/server/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/region_syncer/client.go b/server/region_syncer/client.go
index 476135ddea2..74fff7c4ea4 100644
--- a/server/region_syncer/client.go
+++ b/server/region_syncer/client.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@ import (
 	"context"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/grpcutil"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/grpcutil"
+	"github.com/tikv/pd/server/core"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
diff --git a/server/region_syncer/history_buffer.go b/server/region_syncer/history_buffer.go
index 0b94d6f859c..0ee891b1c4e 100644
--- a/server/region_syncer/history_buffer.go
+++ b/server/region_syncer/history_buffer.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ import (
 	"sync"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/kv"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/kv"
 	"go.uber.org/zap"
 )
 
diff --git a/server/region_syncer/history_buffer_test.go b/server/region_syncer/history_buffer_test.go
index 9a349132f89..d17f7af31c0 100644
--- a/server/region_syncer/history_buffer_test.go
+++ b/server/region_syncer/history_buffer_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/kv"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/kv"
 )
 
 var _ = Suite(&testHistoryBuffer{})
diff --git a/server/region_syncer/metrics.go b/server/region_syncer/metrics.go
index 185064ed0e9..ad2c9386899 100644
--- a/server/region_syncer/metrics.go
+++ b/server/region_syncer/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/region_syncer/server.go b/server/region_syncer/server.go
index 9b81d7a1c6c..8c464e97d6d 100644
--- a/server/region_syncer/server.go
+++ b/server/region_syncer/server.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,12 +20,12 @@ import (
 	"time"
 
 	"github.com/juju/ratelimit"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/grpcutil"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/grpcutil"
+	"github.com/tikv/pd/server/core"
 	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/server/replication/metrics.go b/server/replication/metrics.go
index f5dbf72f28d..8322ac0141a 100644
--- a/server/replication/metrics.go
+++ b/server/replication/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/replication/replication_mode.go b/server/replication/replication_mode.go
index d97ec6ce90d..dff8181d69e 100644
--- a/server/replication/replication_mode.go
+++ b/server/replication/replication_mode.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ import (
 
 	pb "github.com/pingcap/kvproto/pkg/replication_modepb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/opt"
 	"go.uber.org/zap"
 )
 
@@ -292,7 +292,7 @@ func (m *ModeManager) drPersistStatus(status drAutoSyncStatus) error {
 			// inability to accurately determine whether data is fully
 			// synchronized when using dr DC to disaster recovery.
 			// TODO: introduce PD's leader-follower connection timeout to solve
-			// this issue. More details: https://github.com/pingcap/pd/issues/2490
+			// this issue. More details: https://github.com/tikv/pd/issues/2490
 			return nil
 		}
 	}
diff --git a/server/replication/replication_mode_test.go b/server/replication/replication_mode_test.go
index 0ffafb77281..5e0b0a75fb2 100644
--- a/server/replication/replication_mode_test.go
+++ b/server/replication/replication_mode_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,12 +21,12 @@ import (
 
 	. "github.com/pingcap/check"
 	pb "github.com/pingcap/kvproto/pkg/replication_modepb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/kv"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/kv"
 )
 
 func TestReplicationMode(t *testing.T) {
diff --git a/server/schedule/checker/learner_checker.go b/server/schedule/checker/learner_checker.go
index c8cb477ae7d..0167580e8b4 100644
--- a/server/schedule/checker/learner_checker.go
+++ b/server/schedule/checker/learner_checker.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@ package checker
 
 import (
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 	"go.uber.org/zap"
 )
 
diff --git a/server/schedule/checker/learner_checker_test.go b/server/schedule/checker/learner_checker_test.go
index 69d68e226c1..29f365172c9 100644
--- a/server/schedule/checker/learner_checker_test.go
+++ b/server/schedule/checker/learner_checker_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@ package checker
 import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/operator"
 )
 
 type testLearnerCheckerSuite struct{}
@@ -35,7 +35,7 @@ func (s *testLearnerCheckerSuite) TestPromoteLearner(c *C) {
 			Peers: []*metapb.Peer{
 				{Id: 101, StoreId: 1},
 				{Id: 102, StoreId: 2},
-				{Id: 103, StoreId: 3, IsLearner: true},
+				{Id: 103, StoreId: 3, Role: metapb.PeerRole_Learner},
 			},
 		}, &metapb.Peer{Id: 101, StoreId: 1})
 	op := lc.Check(region)
diff --git a/server/schedule/checker/merge_checker.go b/server/schedule/checker/merge_checker.go
index d1f04b03550..3202f68f1dc 100644
--- a/server/schedule/checker/merge_checker.go
+++ b/server/schedule/checker/merge_checker.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@ import (
 	"time"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/cache"
-	"github.com/pingcap/pd/v4/pkg/codec"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
+	"github.com/tikv/pd/pkg/cache"
+	"github.com/tikv/pd/pkg/codec"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedule/placement"
 	"go.uber.org/zap"
 )
 
diff --git a/server/schedule/checker/merge_checker_test.go b/server/schedule/checker/merge_checker_test.go
index 6213b5aa479..31e3f33bf78 100644
--- a/server/schedule/checker/merge_checker_test.go
+++ b/server/schedule/checker/merge_checker_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,13 +21,13 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedule/placement"
 	"go.uber.org/goleak"
 )
 
diff --git a/server/schedule/checker/metrics.go b/server/schedule/checker/metrics.go
index 06e857a6c73..0e2c6bf1b8b 100644
--- a/server/schedule/checker/metrics.go
+++ b/server/schedule/checker/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/schedule/checker/replica_checker.go b/server/schedule/checker/replica_checker.go
index a5623e81b80..3bfe5f14357 100644
--- a/server/schedule/checker/replica_checker.go
+++ b/server/schedule/checker/replica_checker.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 	"go.uber.org/zap"
 )
 
diff --git a/server/schedule/checker/replica_checker_test.go b/server/schedule/checker/replica_checker_test.go
index 67081a03095..b184c64549d 100644
--- a/server/schedule/checker/replica_checker_test.go
+++ b/server/schedule/checker/replica_checker_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 )
 
 const (
diff --git a/server/schedule/checker/replica_strategy.go b/server/schedule/checker/replica_strategy.go
index e2d3dedc5f8..d77d5fe49ce 100644
--- a/server/schedule/checker/replica_strategy.go
+++ b/server/schedule/checker/replica_strategy.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@ package checker
 
 import (
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/opt"
 	"go.uber.org/zap"
 )
 
diff --git a/server/schedule/checker/rule_checker.go b/server/schedule/checker/rule_checker.go
index e2eccb7553e..0f312e9e165 100644
--- a/server/schedule/checker/rule_checker.go
+++ b/server/schedule/checker/rule_checker.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
 package checker
 
 import (
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedule/placement"
 	"go.uber.org/zap"
 )
 
@@ -117,7 +117,7 @@ func (c *RuleChecker) addRulePeer(region *core.RegionInfo, rf *placement.RuleFit
 		checkerCounter.WithLabelValues("rule_checker", "no-store-add").Inc()
 		return nil, errors.New("no store to add peer")
 	}
-	peer := &metapb.Peer{StoreId: store, IsLearner: rf.Rule.Role == placement.Learner}
+	peer := &metapb.Peer{StoreId: store, Role: rf.Rule.Role.MetaPeerRole()}
 	return operator.CreateAddPeerOperator("add-rule-peer", c.cluster, region, peer, operator.OpReplica)
 }
 
@@ -128,12 +128,12 @@ func (c *RuleChecker) replaceRulePeer(region *core.RegionInfo, rf *placement.Rul
 		checkerCounter.WithLabelValues("rule_checker", "no-store-replace").Inc()
 		return nil, errors.New("no store to replace peer")
 	}
-	newPeer := &metapb.Peer{StoreId: store, IsLearner: rf.Rule.Role == placement.Learner}
+	newPeer := &metapb.Peer{StoreId: store, Role: rf.Rule.Role.MetaPeerRole()}
 	return operator.CreateMovePeerOperator("replace-rule-"+status+"-peer", c.cluster, region, operator.OpReplica, peer.StoreId, newPeer)
 }
 
 func (c *RuleChecker) fixLooseMatchPeer(region *core.RegionInfo, fit *placement.RegionFit, rf *placement.RuleFit, peer *metapb.Peer) (*operator.Operator, error) {
-	if peer.IsLearner && rf.Rule.Role != placement.Learner {
+	if core.IsLearner(peer) && rf.Rule.Role != placement.Learner {
 		checkerCounter.WithLabelValues("rule_checker", "fix-peer-role").Inc()
 		return operator.CreatePromoteLearnerOperator("fix-peer-role", c.cluster, region, peer)
 	}
@@ -151,7 +151,7 @@ func (c *RuleChecker) fixLooseMatchPeer(region *core.RegionInfo, fit *placement.
 }
 
 func (c *RuleChecker) allowLeader(fit *placement.RegionFit, peer *metapb.Peer) bool {
-	if peer.GetIsLearner() {
+	if core.IsLearner(peer) {
 		return false
 	}
 	s := c.cluster.GetStore(peer.GetStoreId())
@@ -188,7 +188,7 @@ func (c *RuleChecker) fixBetterLocation(region *core.RegionInfo, rf *placement.R
 		return nil, nil
 	}
 	checkerCounter.WithLabelValues("rule_checker", "move-to-better-location").Inc()
-	newPeer := &metapb.Peer{StoreId: newStore, IsLearner: rf.Rule.Role == placement.Learner}
+	newPeer := &metapb.Peer{StoreId: newStore, Role: rf.Rule.Role.MetaPeerRole()}
 	return operator.CreateMovePeerOperator("move-to-better-location", c.cluster, region, operator.OpReplica, oldStore, newPeer)
 }
 
diff --git a/server/schedule/checker/rule_checker_test.go b/server/schedule/checker/rule_checker_test.go
index d60c80606cb..f8f6d80401d 100644
--- a/server/schedule/checker/rule_checker_test.go
+++ b/server/schedule/checker/rule_checker_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/placement"
 )
 
 var _ = Suite(&testRuleCheckerSuite{})
@@ -174,7 +174,7 @@ func (s *testRuleCheckerSuite) TestFixRole(c *C) {
 	s.cluster.AddLeaderRegionWithRange(1, "", "", 2, 1, 3)
 	r := s.cluster.GetRegion(1)
 	p := r.GetStorePeer(1)
-	p.IsLearner = true
+	p.Role = metapb.PeerRole_Learner
 	r = r.Clone(core.WithLearners([]*metapb.Peer{p}))
 	op := s.rc.Check(r)
 	c.Assert(op, NotNil)
@@ -288,7 +288,7 @@ func (s *testRuleCheckerSuite) TestIssue2419(c *C) {
 	s.cluster.SetStoreOffline(3)
 	s.cluster.AddLeaderRegionWithRange(1, "", "", 1, 2, 3)
 	r := s.cluster.GetRegion(1)
-	r = r.Clone(core.WithAddPeer(&metapb.Peer{Id: 5, StoreId: 4, IsLearner: true}))
+	r = r.Clone(core.WithAddPeer(&metapb.Peer{Id: 5, StoreId: 4, Role: metapb.PeerRole_Learner}))
 	op := s.rc.Check(r)
 	c.Assert(op, NotNil)
 	c.Assert(op.Desc(), Equals, "remove-orphan-peer")
diff --git a/server/schedule/checker_controller.go b/server/schedule/checker_controller.go
index b237487bf1f..cdfa5bf0b83 100644
--- a/server/schedule/checker_controller.go
+++ b/server/schedule/checker_controller.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@ package schedule
 import (
 	"context"
 
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/checker"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/checker"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedule/placement"
 )
 
 // CheckerController is used to manage all checkers.
diff --git a/server/schedule/filter/candidates.go b/server/schedule/filter/candidates.go
index 3a3dfbbf69f..57da91be859 100644
--- a/server/schedule/filter/candidates.go
+++ b/server/schedule/filter/candidates.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ import (
 	"math/rand"
 	"sort"
 
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/opt"
 )
 
 // StoreCandidates wraps store list and proivde utilities to select source or
diff --git a/server/schedule/filter/candidates_test.go b/server/schedule/filter/candidates_test.go
index 34bff485f24..40f655b862b 100644
--- a/server/schedule/filter/candidates_test.go
+++ b/server/schedule/filter/candidates_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
 
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/opt"
 )
 
 // A dummy comparer for testing.
diff --git a/server/schedule/filter/comparer.go b/server/schedule/filter/comparer.go
index b8fe490548f..27ed4e937f1 100644
--- a/server/schedule/filter/comparer.go
+++ b/server/schedule/filter/comparer.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
 package filter
 
 import (
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/opt"
 )
 
 // StoreComparer compares 2 stores. Often used for StoreCandidates to
diff --git a/server/schedule/filter/filters.go b/server/schedule/filter/filters.go
index c92bde1bb87..93f4631092c 100644
--- a/server/schedule/filter/filters.go
+++ b/server/schedule/filter/filters.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,11 +16,14 @@ package filter
 import (
 	"fmt"
 
-	"github.com/pingcap/pd/v4/pkg/slice"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
+	"github.com/pingcap/kvproto/pkg/metapb"
+	"github.com/pingcap/log"
+	"github.com/tikv/pd/pkg/slice"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedule/placement"
+	"github.com/tikv/pd/server/schedule/storelimit"
+	"go.uber.org/zap"
 )
 
 // revive:disable:unused-parameter
@@ -423,7 +426,9 @@ func (f *ruleFitFilter) Source(opt opt.Options, store *core.StoreInfo) bool {
 }
 
 func (f *ruleFitFilter) Target(opt opt.Options, store *core.StoreInfo) bool {
-	region := f.region.Clone(core.WithReplacePeerStore(f.oldStore, store.GetID()))
+	region := createRegionForRuleFit(f.region.GetStartKey(), f.region.GetEndKey(),
+		f.region.GetPeers(), f.region.GetLeader(),
+		core.WithReplacePeerStore(f.oldStore, store.GetID()))
 	newFit := f.fitter.FitRegion(region)
 	return placement.CompareRegionFit(f.oldFit, newFit) <= 0
 }
@@ -461,10 +466,15 @@ func (f *ruleLeaderFitFilter) Source(opt opt.Options, store *core.StoreInfo) boo
 }
 
 func (f *ruleLeaderFitFilter) Target(opt opt.Options, store *core.StoreInfo) bool {
-	oldLeaderPeerReplica := *f.region.GetLeader()
-	oldLeaderPeerReplica.StoreId = store.GetID()
-	region := f.region.Clone(core.WithReplacePeerStore(f.oldLeaderStoreID, store.GetID()), core.WithLeader(&oldLeaderPeerReplica))
-	newFit := f.fitter.FitRegion(region)
+	targetPeer := f.region.GetStorePeer(store.GetID())
+	if targetPeer == nil {
+		log.Warn("ruleLeaderFitFilter couldn't find peer on target Store", zap.Uint64("target-store", store.GetID()))
+		return false
+	}
+	copyRegion := createRegionForRuleFit(f.region.GetStartKey(), f.region.GetEndKey(),
+		f.region.GetPeers(), f.region.GetLeader(),
+		core.WithLeader(targetPeer))
+	newFit := f.fitter.FitRegion(copyRegion)
 	return placement.CompareRegionFit(f.oldFit, newFit) <= 0
 }
 
@@ -667,3 +677,29 @@ func (f *isolationFilter) Target(opt opt.Options, store *core.StoreInfo) bool {
 	}
 	return true
 }
+
+// createRegionForRuleFit is used to create a clone region with RegionCreateOptions which is only used for
+// FitRegion in filter
+func createRegionForRuleFit(startKey, endKey []byte,
+	peers []*metapb.Peer, leader *metapb.Peer, opts ...core.RegionCreateOption) *core.RegionInfo {
+	copyLeader := &metapb.Peer{
+		Id:      leader.Id,
+		StoreId: leader.StoreId,
+		Role:    leader.Role,
+	}
+	copyPeers := make([]*metapb.Peer, 0, len(peers))
+	for _, p := range peers {
+		peer := &metapb.Peer{
+			Id:      p.Id,
+			StoreId: p.StoreId,
+			Role:    p.Role,
+		}
+		copyPeers = append(copyPeers, peer)
+	}
+	cloneRegion := core.NewRegionInfo(&metapb.Region{
+		StartKey: startKey,
+		EndKey:   endKey,
+		Peers:    copyPeers,
+	}, copyLeader, opts...)
+	return cloneRegion
+}
diff --git a/server/schedule/filter/filters_test.go b/server/schedule/filter/filters_test.go
index f62628d2447..3672ca76e98 100644
--- a/server/schedule/filter/filters_test.go
+++ b/server/schedule/filter/filters_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/placement"
 )
 
 func Test(t *testing.T) {
@@ -272,3 +272,28 @@ func (s *testFiltersSuite) TestPlacementGuard(c *C) {
 		FitsTypeOf,
 		newRuleFitFilter("", testCluster, region, 1))
 }
+
+func BenchmarkCloneRegionTest(b *testing.B) {
+	epoch := &metapb.RegionEpoch{
+		ConfVer: 1,
+		Version: 1,
+	}
+	region := core.NewRegionInfo(
+		&metapb.Region{
+			Id:       4,
+			StartKey: []byte("x"),
+			EndKey:   []byte(""),
+			Peers: []*metapb.Peer{
+				{Id: 108, StoreId: 4},
+			},
+			RegionEpoch: epoch,
+		},
+		&metapb.Peer{Id: 108, StoreId: 4},
+		core.SetApproximateSize(50),
+		core.SetApproximateKeys(20),
+	)
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_ = createRegionForRuleFit(region.GetStartKey(), region.GetEndKey(), region.GetPeers(), region.GetLeader())
+	}
+}
diff --git a/server/schedule/filter/metrics.go b/server/schedule/filter/metrics.go
index 39a2d79c2c9..93f5ba3ed3a 100644
--- a/server/schedule/filter/metrics.go
+++ b/server/schedule/filter/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/schedule/metrics.go b/server/schedule/metrics.go
index 0821c95a8f5..80205d8068d 100644
--- a/server/schedule/metrics.go
+++ b/server/schedule/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/schedule/operator/builder.go b/server/schedule/operator/builder.go
index f913590cc46..35a98437b83 100644
--- a/server/schedule/operator/builder.go
+++ b/server/schedule/operator/builder.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@ import (
 	"fmt"
 	"sort"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/placement"
 )
 
 // Builder is used to create operators. Usage:
@@ -130,7 +130,7 @@ func (b *Builder) PromoteLearner(storeID uint64) *Builder {
 	p := b.targetPeers.Get(storeID)
 	if p == nil {
 		b.err = errors.Errorf("cannot promote peer %d: not found", storeID)
-	} else if !p.GetIsLearner() {
+	} else if !core.IsLearner(p) {
 		b.err = errors.Errorf("cannot promote peer %d: not learner", storeID)
 	} else {
 		b.targetPeers.Set(&metapb.Peer{Id: p.GetId(), StoreId: p.GetStoreId()})
@@ -146,7 +146,7 @@ func (b *Builder) SetLeader(storeID uint64) *Builder {
 	p := b.targetPeers.Get(storeID)
 	if p == nil {
 		b.err = errors.Errorf("cannot transfer leader to %d: not found", storeID)
-	} else if p.GetIsLearner() {
+	} else if core.IsLearner(p) {
 		b.err = errors.Errorf("cannot transfer leader to %d: not voter", storeID)
 	} else {
 		b.targetLeader = storeID
@@ -205,7 +205,7 @@ func (b *Builder) Build(kind OpKind) (*Operator, error) {
 func (b *Builder) prepareBuild() (string, error) {
 	var voterCount int
 	for _, p := range b.targetPeers.m {
-		if !p.GetIsLearner() {
+		if !core.IsLearner(p) {
 			voterCount++
 		}
 	}
@@ -218,17 +218,17 @@ func (b *Builder) prepareBuild() (string, error) {
 	for _, o := range b.originPeers.m {
 		n := b.targetPeers.Get(o.GetStoreId())
 		// no peer in targets, or target is learner while old one is voter.
-		if n == nil || (n.GetIsLearner() && !o.GetIsLearner()) {
+		if n == nil || (core.IsLearner(n) && !core.IsLearner(o)) {
 			b.toRemove.Set(o)
 			continue
 		}
-		if o.GetIsLearner() && !n.GetIsLearner() {
+		if core.IsLearner(o) && !core.IsLearner(n) {
 			b.toPromote.Set(n)
 		}
 	}
 	for _, n := range b.targetPeers.m {
 		o := b.originPeers.Get(n.GetStoreId())
-		if o == nil || (n.GetIsLearner() && !o.GetIsLearner()) {
+		if o == nil || (core.IsLearner(n) && !core.IsLearner(o)) {
 			// old peer not exists, or target is learner while old one is voter.
 			if n.GetId() == 0 {
 				// Allocate peer ID if need.
@@ -322,7 +322,7 @@ func (b *Builder) execAddPeer(p *metapb.Peer) {
 	} else {
 		b.steps = append(b.steps, AddLearner{ToStore: p.GetStoreId(), PeerID: p.GetId()})
 	}
-	if !p.GetIsLearner() {
+	if !core.IsLearner(p) {
 		b.steps = append(b.steps, PromoteLearner{ToStore: p.GetStoreId(), PeerID: p.GetId()})
 	}
 	b.currentPeers.Set(p)
@@ -344,7 +344,7 @@ func (b *Builder) allowLeader(peer *metapb.Peer) bool {
 	if peer.GetStoreId() == b.currentLeader {
 		return true
 	}
-	if peer.GetIsLearner() {
+	if core.IsLearner(peer) {
 		return false
 	}
 	store := b.cluster.GetStore(peer.GetStoreId())
@@ -417,7 +417,7 @@ func (b *Builder) planReplace() stepPlan {
 		add := b.toAdd.Get(i)
 		for _, j := range b.toRemove.IDs() {
 			remove := b.toRemove.Get(j)
-			if remove.GetIsLearner() == add.GetIsLearner() {
+			if core.IsLearner(remove) == core.IsLearner(add) {
 				best = b.planReplaceLeaders(best, stepPlan{add: add, remove: remove})
 			}
 		}
@@ -426,9 +426,9 @@ func (b *Builder) planReplace() stepPlan {
 	for _, i := range b.toPromote.IDs() {
 		promote := b.toPromote.Get(i)
 		for _, j := range b.toAdd.IDs() {
-			if add := b.toAdd.Get(j); add.GetIsLearner() {
+			if add := b.toAdd.Get(j); core.IsLearner(add) {
 				for _, k := range b.toRemove.IDs() {
-					if remove := b.toRemove.Get(k); !remove.GetIsLearner() && j != k {
+					if remove := b.toRemove.Get(k); !core.IsLearner(remove) && j != k {
 						best = b.planReplaceLeaders(best, stepPlan{promote: promote, add: add, remove: remove})
 					}
 				}
@@ -597,7 +597,7 @@ func (b *Builder) preferTargetLeader(p stepPlan) int {
 
 // It is better to add target leader as early as possible.
 func (b *Builder) preferAddOrPromoteTargetLeader(p stepPlan) int {
-	addTarget := p.add != nil && !p.add.GetIsLearner() && p.add.GetStoreId() == b.targetLeader
+	addTarget := p.add != nil && !core.IsLearner(p.add) && p.add.GetStoreId() == b.targetLeader
 	promoteTarget := p.promote != nil && p.promote.GetStoreId() == b.targetLeader
 	return b2i(addTarget || promoteTarget)
 }
diff --git a/server/schedule/operator/builder_test.go b/server/schedule/operator/builder_test.go
index 3a6a64dc44f..f522d97dcb4 100644
--- a/server/schedule/operator/builder_test.go
+++ b/server/schedule/operator/builder_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@ package operator
 import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/opt"
 )
 
 var _ = Suite(&testBuilderSuite{})
@@ -46,7 +46,7 @@ func (s *testBuilderSuite) SetUpTest(c *C) {
 }
 
 func (s *testBuilderSuite) TestNewBuilder(c *C) {
-	peers := []*metapb.Peer{{Id: 11, StoreId: 1}, {Id: 12, StoreId: 2, IsLearner: true}}
+	peers := []*metapb.Peer{{Id: 11, StoreId: 1}, {Id: 12, StoreId: 2, Role: metapb.PeerRole_Learner}}
 	region := core.NewRegionInfo(&metapb.Region{Id: 42, Peers: peers}, peers[0])
 	builder := NewBuilder("test", s.cluster, region)
 	c.Assert(builder.err, IsNil)
@@ -66,7 +66,7 @@ func (s *testBuilderSuite) newBuilder() *Builder {
 	peers := []*metapb.Peer{
 		{Id: 11, StoreId: 1},
 		{Id: 12, StoreId: 2},
-		{Id: 13, StoreId: 3, IsLearner: true},
+		{Id: 13, StoreId: 3, Role: metapb.PeerRole_Learner},
 	}
 	region := core.NewRegionInfo(&metapb.Region{Id: 1, Peers: peers}, peers[0])
 	return NewBuilder("test", s.cluster, region)
@@ -80,7 +80,7 @@ func (s *testBuilderSuite) TestRecord(c *C) {
 	c.Assert(s.newBuilder().SetLeader(1).SetLeader(2).err, IsNil)
 	c.Assert(s.newBuilder().SetLeader(3).err, NotNil)
 	c.Assert(s.newBuilder().RemovePeer(4).err, NotNil)
-	c.Assert(s.newBuilder().AddPeer(&metapb.Peer{StoreId: 4, IsLearner: true}).RemovePeer(4).err, IsNil)
+	c.Assert(s.newBuilder().AddPeer(&metapb.Peer{StoreId: 4, Role: metapb.PeerRole_Learner}).RemovePeer(4).err, IsNil)
 	c.Assert(s.newBuilder().SetLeader(2).RemovePeer(2).err, NotNil)
 	c.Assert(s.newBuilder().PromoteLearner(4).err, NotNil)
 	c.Assert(s.newBuilder().SetLeader(4).err, NotNil)
@@ -88,7 +88,7 @@ func (s *testBuilderSuite) TestRecord(c *C) {
 
 	m := map[uint64]*metapb.Peer{
 		2: {StoreId: 2},
-		3: {StoreId: 3, IsLearner: true},
+		3: {StoreId: 3, Role: metapb.PeerRole_Learner},
 		4: {StoreId: 4},
 	}
 	builder := s.newBuilder().SetPeers(m).SetLightWeight()
@@ -102,24 +102,24 @@ func (s *testBuilderSuite) TestRecord(c *C) {
 
 func (s *testBuilderSuite) TestPrepareBuild(c *C) {
 	// no voter.
-	_, err := s.newBuilder().SetPeers(map[uint64]*metapb.Peer{4: {StoreId: 4, IsLearner: true}}).prepareBuild()
+	_, err := s.newBuilder().SetPeers(map[uint64]*metapb.Peer{4: {StoreId: 4, Role: metapb.PeerRole_Learner}}).prepareBuild()
 	c.Assert(err, NotNil)
 
 	builder := s.newBuilder().SetPeers(map[uint64]*metapb.Peer{
-		1: {StoreId: 1, IsLearner: true},
+		1: {StoreId: 1, Role: metapb.PeerRole_Learner},
 		2: {StoreId: 2},
 		3: {StoreId: 3},
 		4: {StoreId: 4, Id: 14},
-		5: {StoreId: 5, IsLearner: true},
+		5: {StoreId: 5, Role: metapb.PeerRole_Learner},
 	})
 	_, err = builder.prepareBuild()
 	c.Assert(err, IsNil)
 	c.Assert(builder.toAdd.Len(), Equals, 3)
-	c.Assert(builder.toAdd.Get(1).IsLearner, IsTrue)
+	c.Assert(builder.toAdd.Get(1).Role, Equals, metapb.PeerRole_Learner)
 	c.Assert(builder.toAdd.Get(1).Id, Not(Equals), uint64(0))
-	c.Assert(builder.toAdd.Get(4).IsLearner, IsFalse)
+	c.Assert(builder.toAdd.Get(4).Role, Not(Equals), metapb.PeerRole_Learner)
 	c.Assert(builder.toAdd.Get(4).Id, Equals, uint64(14))
-	c.Assert(builder.toAdd.Get(5).IsLearner, IsTrue)
+	c.Assert(builder.toAdd.Get(5).Role, Equals, metapb.PeerRole_Learner)
 	c.Assert(builder.toAdd.Get(5).Id, Not(Equals), uint64(0))
 	c.Assert(builder.toRemove.Len(), Equals, 1)
 	c.Assert(builder.toRemove.Get(1), NotNil)
@@ -136,8 +136,8 @@ func (s *testBuilderSuite) TestBuild(c *C) {
 	}
 	cases := []testCase{
 		{ // prefer replace
-			[]*metapb.Peer{{Id: 1, StoreId: 1}, {Id: 2, StoreId: 2}, {Id: 3, StoreId: 3, IsLearner: true}},
-			[]*metapb.Peer{{StoreId: 4}, {StoreId: 5, IsLearner: true}},
+			[]*metapb.Peer{{Id: 1, StoreId: 1}, {Id: 2, StoreId: 2}, {Id: 3, StoreId: 3, Role: metapb.PeerRole_Learner}},
+			[]*metapb.Peer{{StoreId: 4}, {StoreId: 5, Role: metapb.PeerRole_Learner}},
 			[]OpStep{
 				AddLearner{ToStore: 4},
 				PromoteLearner{ToStore: 4},
@@ -160,7 +160,7 @@ func (s *testBuilderSuite) TestBuild(c *C) {
 		},
 		{ // replace voter with learner
 			[]*metapb.Peer{{Id: 1, StoreId: 1}, {Id: 2, StoreId: 2}},
-			[]*metapb.Peer{{StoreId: 1}, {StoreId: 2, IsLearner: true}},
+			[]*metapb.Peer{{StoreId: 1}, {StoreId: 2, Role: metapb.PeerRole_Learner}},
 			[]OpStep{
 				RemovePeer{FromStore: 2},
 				AddLearner{ToStore: 2},
@@ -190,7 +190,7 @@ func (s *testBuilderSuite) TestBuild(c *C) {
 			},
 		},
 		{ // promote learner
-			[]*metapb.Peer{{Id: 1, StoreId: 1}, {Id: 2, StoreId: 2, IsLearner: true}},
+			[]*metapb.Peer{{Id: 1, StoreId: 1}, {Id: 2, StoreId: 2, Role: metapb.PeerRole_Learner}},
 			[]*metapb.Peer{{Id: 2, StoreId: 2}, {Id: 1, StoreId: 1}},
 			[]OpStep{
 				PromoteLearner{ToStore: 2},
@@ -208,8 +208,8 @@ func (s *testBuilderSuite) TestBuild(c *C) {
 			[]OpStep{},
 		},
 		{ // add learner + promote learner + remove voter
-			[]*metapb.Peer{{Id: 1, StoreId: 1}, {Id: 2, StoreId: 2, IsLearner: true}},
-			[]*metapb.Peer{{Id: 2, StoreId: 2}, {Id: 3, StoreId: 3, IsLearner: true}},
+			[]*metapb.Peer{{Id: 1, StoreId: 1}, {Id: 2, StoreId: 2, Role: metapb.PeerRole_Learner}},
+			[]*metapb.Peer{{Id: 2, StoreId: 2}, {Id: 3, StoreId: 3, Role: metapb.PeerRole_Learner}},
 			[]OpStep{
 				AddLearner{ToStore: 3},
 				PromoteLearner{ToStore: 2},
diff --git a/server/schedule/operator/create_operator.go b/server/schedule/operator/create_operator.go
index 6d85decca10..1b6b34cd9bb 100644
--- a/server/schedule/operator/create_operator.go
+++ b/server/schedule/operator/create_operator.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server/core"
 )
 
 // CreateAddPeerOperator creates an operator that adds a new peer.
@@ -101,8 +101,8 @@ func CreateMergeRegionOperator(desc string, cluster Cluster, source *core.Region
 		peers := make(map[uint64]*metapb.Peer)
 		for _, p := range target.GetPeers() {
 			peers[p.GetStoreId()] = &metapb.Peer{
-				StoreId:   p.GetStoreId(),
-				IsLearner: p.GetIsLearner(),
+				StoreId: p.GetStoreId(),
+				Role:    p.GetRole(),
 			}
 		}
 		matchOp, err := NewBuilder("", cluster, source).
@@ -139,7 +139,7 @@ func isRegionMatch(a, b *core.RegionInfo) bool {
 	}
 	for _, pa := range a.GetPeers() {
 		pb := b.GetStorePeer(pa.GetStoreId())
-		if pb == nil || pb.GetIsLearner() != pa.GetIsLearner() {
+		if pb == nil || core.IsLearner(pb) != core.IsLearner(pa) {
 			return false
 		}
 	}
@@ -151,7 +151,7 @@ func CreateScatterRegionOperator(desc string, cluster Cluster, origin *core.Regi
 	// randomly pick a leader.
 	var ids []uint64
 	for id, peer := range targetPeers {
-		if !peer.IsLearner {
+		if !core.IsLearner(peer) {
 			ids = append(ids, id)
 		}
 	}
diff --git a/server/schedule/operator/influence.go b/server/schedule/operator/influence.go
index 6f55be592bf..1e02a388aa5 100644
--- a/server/schedule/operator/influence.go
+++ b/server/schedule/operator/influence.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
 package operator
 
 import (
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/storelimit"
 )
 
 // OpInfluence records the influence of the cluster.
diff --git a/server/schedule/operator/kind.go b/server/schedule/operator/kind.go
index 50db9824103..ad2ef5f742d 100644
--- a/server/schedule/operator/kind.go
+++ b/server/schedule/operator/kind.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ package operator
 import (
 	"strings"
 
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
 )
 
 // OpKind is a bit field to identify operator types.
diff --git a/server/schedule/operator/metrics.go b/server/schedule/operator/metrics.go
index 71d52747bae..a199775740a 100644
--- a/server/schedule/operator/metrics.go
+++ b/server/schedule/operator/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/schedule/operator/operator.go b/server/schedule/operator/operator.go
index b716923ea5d..bb37eef6c52 100644
--- a/server/schedule/operator/operator.go
+++ b/server/schedule/operator/operator.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ import (
 	"time"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedule/placement"
 )
 
 const (
diff --git a/server/schedule/operator/operator_test.go b/server/schedule/operator/operator_test.go
index a4a9aa1bdac..afc3ebdf368 100644
--- a/server/schedule/operator/operator_test.go
+++ b/server/schedule/operator/operator_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedule/storelimit"
 )
 
 func Test(t *testing.T) {
diff --git a/server/schedule/operator/status.go b/server/schedule/operator/status.go
index 75b962cd435..6b2a46c4cf6 100644
--- a/server/schedule/operator/status.go
+++ b/server/schedule/operator/status.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/schedule/operator/status_test.go b/server/schedule/operator/status_test.go
index 92b508541d3..f7e61bf1a34 100644
--- a/server/schedule/operator/status_test.go
+++ b/server/schedule/operator/status_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/schedule/operator/status_tracker.go b/server/schedule/operator/status_tracker.go
index 88d980851df..ba95ebd60a6 100644
--- a/server/schedule/operator/status_tracker.go
+++ b/server/schedule/operator/status_tracker.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/schedule/operator/status_tracker_test.go b/server/schedule/operator/status_tracker_test.go
index 3c65034d098..556a46841c8 100644
--- a/server/schedule/operator/status_tracker_test.go
+++ b/server/schedule/operator/status_tracker_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/schedule/operator/step.go b/server/schedule/operator/step.go
index 980ae1f00f8..e29778e1cda 100644
--- a/server/schedule/operator/step.go
+++ b/server/schedule/operator/step.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@ import (
 	"bytes"
 	"fmt"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/storelimit"
 	"go.uber.org/zap"
 )
 
@@ -60,7 +60,7 @@ func (tl TransferLeader) CheckSafety(region *core.RegionInfo) error {
 	if peer == nil {
 		return errors.New("peer does not existed")
 	}
-	if peer.IsLearner {
+	if core.IsLearner(peer) {
 		return errors.New("peer already is a learner")
 	}
 	return nil
@@ -162,7 +162,7 @@ func (al AddLearner) CheckSafety(region *core.RegionInfo) error {
 	if peer.GetId() != al.PeerID {
 		return errors.Errorf("peer %d has already existed in store %d, the operator is trying to add peer %d on the same store", peer.GetId(), al.ToStore, al.PeerID)
 	}
-	if !peer.IsLearner {
+	if !core.IsLearner(peer) {
 		return errors.New("peer already is a voter")
 	}
 	return nil
@@ -424,7 +424,7 @@ func (al AddLightLearner) CheckSafety(region *core.RegionInfo) error {
 	if peer.GetId() != al.PeerID {
 		return errors.Errorf("peer %d has already existed in store %d, the operator is trying to add peer %d on the same store", peer.GetId(), al.ToStore, al.PeerID)
 	}
-	if !peer.IsLearner {
+	if !core.IsLearner(peer) {
 		return errors.New("peer already is a voter")
 	}
 	return nil
diff --git a/server/schedule/operator/test_util.go b/server/schedule/operator/test_util.go
index e6d6c1c6045..050f67d63bf 100644
--- a/server/schedule/operator/test_util.go
+++ b/server/schedule/operator/test_util.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/schedule/operator_controller.go b/server/schedule/operator_controller.go
index 15129ea2872..6204400815a 100644
--- a/server/schedule/operator_controller.go
+++ b/server/schedule/operator_controller.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -27,11 +27,11 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/cache"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
+	"github.com/tikv/pd/pkg/cache"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedule/storelimit"
 	"go.uber.org/zap"
 )
 
@@ -662,9 +662,9 @@ func (oc *OperatorController) SendScheduleCommand(region *core.RegionInfo, step
 			ChangePeer: &pdpb.ChangePeer{
 				ChangeType: eraftpb.ConfChangeType_AddLearnerNode,
 				Peer: &metapb.Peer{
-					Id:        st.PeerID,
-					StoreId:   st.ToStore,
-					IsLearner: true,
+					Id:      st.PeerID,
+					StoreId: st.ToStore,
+					Role:    metapb.PeerRole_Learner,
 				},
 			},
 		}
@@ -678,9 +678,9 @@ func (oc *OperatorController) SendScheduleCommand(region *core.RegionInfo, step
 			ChangePeer: &pdpb.ChangePeer{
 				ChangeType: eraftpb.ConfChangeType_AddLearnerNode,
 				Peer: &metapb.Peer{
-					Id:        st.PeerID,
-					StoreId:   st.ToStore,
-					IsLearner: true,
+					Id:      st.PeerID,
+					StoreId: st.ToStore,
+					Role:    metapb.PeerRole_Learner,
 				},
 			},
 		}
diff --git a/server/schedule/operator_controller_test.go b/server/schedule/operator_controller_test.go
index 6f4588afe4c..475277ddbf5 100644
--- a/server/schedule/operator_controller_test.go
+++ b/server/schedule/operator_controller_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,13 +25,13 @@ import (
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/pkg/mock/mockhbstream"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/checker"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockhbstream"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/checker"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/storelimit"
 )
 
 func Test(t *testing.T) {
@@ -47,7 +47,7 @@ type testOperatorControllerSuite struct {
 
 func (t *testOperatorControllerSuite) SetUpSuite(c *C) {
 	t.ctx, t.cancel = context.WithCancel(context.Background())
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/schedule/unexpectedOperator", "return(true)"), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/schedule/unexpectedOperator", "return(true)"), IsNil)
 }
 
 func (t *testOperatorControllerSuite) TearDownSuite(c *C) {
@@ -163,7 +163,7 @@ func (t *testOperatorControllerSuite) TestFastFailOperator(c *C) {
 }
 
 func (t *testOperatorControllerSuite) TestCheckAddUnexpectedStatus(c *C) {
-	c.Assert(failpoint.Disable("github.com/pingcap/pd/v4/server/schedule/unexpectedOperator"), IsNil)
+	c.Assert(failpoint.Disable("github.com/tikv/pd/server/schedule/unexpectedOperator"), IsNil)
 	opt := mockoption.NewScheduleOptions()
 	tc := mockcluster.NewCluster(opt)
 	oc := NewOperatorController(t.ctx, tc, mockhbstream.NewHeartbeatStream())
@@ -246,7 +246,7 @@ func (t *testOperatorControllerSuite) TestConcurrentRemoveOperator(c *C) {
 	c.Assert(op1.Start(), IsTrue)
 	oc.SetOperator(op1)
 
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/schedule/concurrentRemoveOperator", "return(true)"), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/schedule/concurrentRemoveOperator", "return(true)"), IsNil)
 
 	var wg sync.WaitGroup
 	wg.Add(2)
@@ -497,9 +497,9 @@ func (t *testOperatorControllerSuite) TestDispatchUnfinishedStep(c *C) {
 		// region2 has peer 2 in pending state, so the AddPeer step
 		// is left unfinished
 		region2 := region.Clone(
-			core.WithAddPeer(&metapb.Peer{Id: 3, StoreId: 3, IsLearner: true}),
+			core.WithAddPeer(&metapb.Peer{Id: 3, StoreId: 3, Role: metapb.PeerRole_Learner}),
 			core.WithPendingPeers([]*metapb.Peer{
-				{Id: 3, StoreId: 3, IsLearner: true},
+				{Id: 3, StoreId: 3, Role: metapb.PeerRole_Learner},
 			}),
 			core.WithIncConfVer(),
 		)
@@ -519,7 +519,7 @@ func (t *testOperatorControllerSuite) TestDispatchUnfinishedStep(c *C) {
 
 		// Finish the step by clearing the pending state
 		region3 := region.Clone(
-			core.WithAddPeer(&metapb.Peer{Id: 3, StoreId: 3, IsLearner: true}),
+			core.WithAddPeer(&metapb.Peer{Id: 3, StoreId: 3, Role: metapb.PeerRole_Learner}),
 			core.WithIncConfVer(),
 		)
 		c.Assert(steps[0].IsFinish(region3), Equals, true)
diff --git a/server/schedule/operator_queue.go b/server/schedule/operator_queue.go
index 368f87cbf42..b23a55047a1 100644
--- a/server/schedule/operator_queue.go
+++ b/server/schedule/operator_queue.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ package schedule
 import (
 	"time"
 
-	"github.com/pingcap/pd/v4/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/operator"
 )
 
 type operatorWithTime struct {
diff --git a/server/schedule/opt/healthy.go b/server/schedule/opt/healthy.go
index c9a9c67cb27..2932f965625 100644
--- a/server/schedule/opt/healthy.go
+++ b/server/schedule/opt/healthy.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
 
 package opt
 
-import "github.com/pingcap/pd/v4/server/core"
+import "github.com/tikv/pd/server/core"
 
 // IsRegionHealthy checks if a region is healthy for scheduling. It requires the
 // region does not have any down or pending peers. And when placement rules
diff --git a/server/schedule/opt/healthy_test.go b/server/schedule/opt/healthy_test.go
index 3b795e2114a..cf3d32fd0b5 100644
--- a/server/schedule/opt/healthy_test.go
+++ b/server/schedule/opt/healthy_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/server/core"
 )
 
 func TestOpt(t *testing.T) {
diff --git a/server/schedule/opt/opts.go b/server/schedule/opt/opts.go
index 9d25d93a48c..0a5d6a5cc58 100644
--- a/server/schedule/opt/opts.go
+++ b/server/schedule/opt/opts.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,10 +18,11 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
-	"github.com/pingcap/pd/v4/server/statistics"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/placement"
+	"github.com/tikv/pd/server/schedule/storelimit"
+	"github.com/tikv/pd/server/statistics"
+	"github.com/tikv/pd/server/versioninfo"
 )
 
 // Options for schedulers.
@@ -89,6 +90,8 @@ type Cluster interface {
 	AllocID() (uint64, error)
 	FitRegion(*core.RegionInfo) *placement.RegionFit
 	RemoveScheduler(name string) error
+	IsFeatureSupported(f versioninfo.Feature) bool
+	AddSuspectRegions(ids ...uint64)
 }
 
 // HeartbeatStream is an interface.
diff --git a/server/schedule/placement/fit.go b/server/schedule/placement/fit.go
index c17f1d8b65b..934b0d61e0a 100644
--- a/server/schedule/placement/fit.go
+++ b/server/schedule/placement/fit.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ import (
 	"sort"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server/core"
 )
 
 // RegionFit is the result of fitting a region's peers to rule list.
@@ -265,13 +265,13 @@ type fitPeer struct {
 func (p *fitPeer) matchRoleStrict(role PeerRoleType) bool {
 	switch role {
 	case Voter: // Voter matches either Leader or Follower.
-		return !p.IsLearner
+		return !core.IsLearner(p.Peer)
 	case Leader:
 		return p.isLeader
 	case Follower:
-		return !p.IsLearner && !p.isLeader
+		return !core.IsLearner(p.Peer) && !p.isLeader
 	case Learner:
-		return p.IsLearner
+		return core.IsLearner(p.Peer)
 	}
 	return false
 }
@@ -280,7 +280,7 @@ func (p *fitPeer) matchRoleLoose(role PeerRoleType) bool {
 	// non-learner cannot become learner. All other roles can migrate to
 	// others by scheduling. For example, Leader->Follower, Learner->Leader
 	// are possible, but Voter->Learner is impossible.
-	return role != Learner || p.IsLearner
+	return role != Learner || core.IsLearner(p.Peer)
 }
 
 func isolationScore(peers []*fitPeer, labels []string) float64 {
diff --git a/server/schedule/placement/fit_test.go b/server/schedule/placement/fit_test.go
index 93a163c2b2c..2f04c895e93 100644
--- a/server/schedule/placement/fit_test.go
+++ b/server/schedule/placement/fit_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server/core"
 )
 
 var _ = Suite(&testFitSuite{})
@@ -59,7 +59,7 @@ func (s *testFitSuite) makeRegion(def string) *core.RegionInfo {
 			idStr, role = splits[0], PeerRoleType(splits[1])
 		}
 		id, _ := strconv.Atoi(idStr)
-		peer := &metapb.Peer{Id: uint64(id), StoreId: uint64(id), IsLearner: role == Learner}
+		peer := &metapb.Peer{Id: uint64(id), StoreId: uint64(id), Role: role.MetaPeerRole()}
 		regionMeta.Peers = append(regionMeta.Peers, peer)
 		if role == Leader {
 			leader = peer
diff --git a/server/schedule/placement/label_constraint.go b/server/schedule/placement/label_constraint.go
index 8c86e1a56f2..d9d7eadf209 100644
--- a/server/schedule/placement/label_constraint.go
+++ b/server/schedule/placement/label_constraint.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@ package placement
 import (
 	"strings"
 
-	"github.com/pingcap/pd/v4/pkg/slice"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/pkg/slice"
+	"github.com/tikv/pd/server/core"
 )
 
 // LabelConstraintOp defines how a LabelConstraint matches a store. It can be one of
diff --git a/server/schedule/placement/label_constraint_test.go b/server/schedule/placement/label_constraint_test.go
index 376d47cbd7f..98d81be137e 100644
--- a/server/schedule/placement/label_constraint_test.go
+++ b/server/schedule/placement/label_constraint_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ import (
 	"testing"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server/core"
 )
 
 func TestPlacement(t *testing.T) {
diff --git a/server/schedule/placement/rule.go b/server/schedule/placement/rule.go
index 34d512650e1..1bacf4f2b80 100644
--- a/server/schedule/placement/rule.go
+++ b/server/schedule/placement/rule.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"sort"
+
+	"github.com/pingcap/kvproto/pkg/metapb"
 )
 
 // PeerRoleType is the expected peer type of the placement rule.
@@ -37,9 +39,17 @@ func validateRole(s PeerRoleType) bool {
 	return s == Voter || s == Leader || s == Follower || s == Learner
 }
 
+// MetaPeerRole converts placement.PeerRoleType to metapb.PeerRole.
+func (s PeerRoleType) MetaPeerRole() metapb.PeerRole {
+	if s == Learner {
+		return metapb.PeerRole_Learner
+	}
+	return metapb.PeerRole_Voter
+}
+
 // Rule is the placement rule that can be checked against a region. When
 // applying rules (apply means schedule regions to match selected rules), the
-// apply order is defined by the tuple [GroupID, Index, ID].
+// apply order is defined by the tuple [GroupIndex, GroupID, Index, ID].
 type Rule struct {
 	GroupID          string            `json:"group_id"`                    // mark the source that add the rule
 	ID               string            `json:"id"`                          // unique ID within a group
@@ -54,26 +64,46 @@ type Rule struct {
 	LabelConstraints []LabelConstraint `json:"label_constraints,omitempty"` // used to select stores to place peers
 	LocationLabels   []string          `json:"location_labels,omitempty"`   // used to make peers isolated physically
 	IsolationLevel   string            `json:"isolation_level,omitempty"`   // used to isolate replicas explicitly and forcibly
+
+	group *RuleGroup // only set at runtime, no need to {,un}marshal or persist.
 }
 
-func (r Rule) String() string {
+func (r *Rule) String() string {
 	b, _ := json.Marshal(r)
 	return string(b)
 }
 
 // Key returns (groupID, ID) as the global unique key of a rule.
-func (r Rule) Key() [2]string {
+func (r *Rule) Key() [2]string {
 	return [2]string{r.GroupID, r.ID}
 }
 
 // StoreKey returns the rule's key for persistent store.
-func (r Rule) StoreKey() string {
+func (r *Rule) StoreKey() string {
 	return hex.EncodeToString([]byte(r.GroupID)) + "-" + hex.EncodeToString([]byte(r.ID))
 }
 
+func (r *Rule) groupIndex() int {
+	if r.group != nil {
+		return r.group.Index
+	}
+	return 0
+}
+
+// RuleGroup defines properties of a rule group.
+type RuleGroup struct {
+	ID       string `json:"id,omitempty"`
+	Index    int    `json:"index,omitempty"`
+	Override bool   `json:"override,omitempty"`
+}
+
 // Rules are ordered by (GroupID, Index, ID).
 func compareRule(a, b *Rule) int {
 	switch {
+	case a.groupIndex() < b.groupIndex():
+		return -1
+	case a.groupIndex() > b.groupIndex():
+		return 1
 	case a.GroupID < b.GroupID:
 		return -1
 	case a.GroupID > b.GroupID:
@@ -95,17 +125,32 @@ func sortRules(rules []*Rule) {
 	sort.Slice(rules, func(i, j int) bool { return compareRule(rules[i], rules[j]) < 0 })
 }
 
-// Sort Rules, trim concealed rules.
+// prepareRulesForApply search the target rules from the given rules.
+// it will filter the rules depends on the interval index override in the same group or the
+// group-index override between different groups
+// For example, given rules:
+// ruleA: group_id: 4, id: 2, override: true
+// ruleB: group_id: 4, id: 1, override: true
+// ruleC: group_id: 3
+// ruleD: group_id: 2
+// RuleGroupA: id:4, override: false
+// RuleGroupB: id:3, override: true
+// RuleGroupC: id:2, override: false
+// Finally only ruleA and ruleC will be selected.
 func prepareRulesForApply(rules []*Rule) []*Rule {
 	var res []*Rule
 	var i, j int
 	for i = 1; i < len(rules); i++ {
 		if rules[j].GroupID != rules[i].GroupID {
-			res = append(res, rules[j:i]...)
+			if rules[i].group != nil && rules[i].group.Override {
+				res = res[:0] // override all previous groups
+			} else {
+				res = append(res, rules[j:i]...) // save rules belong to previous group
+			}
 			j = i
 		}
 		if rules[i].Override {
-			j = i
+			j = i // skip all previous rules in the same group
 		}
 	}
 	return append(res, rules[j:]...)
diff --git a/server/schedule/placement/rule_list.go b/server/schedule/placement/rule_list.go
index a7fcff0aed1..dd03d58edf5 100644
--- a/server/schedule/placement/rule_list.go
+++ b/server/schedule/placement/rule_list.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,10 +16,12 @@ package placement
 import (
 	"bytes"
 	"encoding/hex"
+	"fmt"
 	"sort"
 	"strings"
 
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
+	"github.com/tikv/pd/pkg/errs"
 )
 
 type splitPointType int
@@ -41,6 +43,7 @@ type sortedRules struct {
 	rules []*Rule
 }
 
+// insertRule inserts a rule into soretedRules while keeping the order unchanged
 func (sr *sortedRules) insertRule(rule *Rule) {
 	i := sort.Search(len(sr.rules), func(i int) bool {
 		return compareRule(sr.rules[i], rule) > 0
@@ -62,19 +65,44 @@ func (sr *sortedRules) deleteRule(rule *Rule) {
 	}
 }
 
+func checkApplyRules(rules []*Rule) error {
+	// check raft constraint
+	// one and only one leader
+	leaderCount := 0
+	voterCount := 0
+	for _, rule := range rules {
+		if rule.Role == Leader {
+			leaderCount += rule.Count
+		} else if rule.Role == Voter {
+			voterCount += rule.Count
+		}
+		if leaderCount > 1 {
+			return errors.New("multiple leader replicas")
+		}
+	}
+	if (leaderCount + voterCount) < 1 {
+		return errors.New("needs at least one leader or voter")
+	}
+	return nil
+}
+
 type rangeRules struct {
-	startKey   []byte
-	rules      []*Rule
+	startKey []byte
+	// rules indicates all the rules match the given range
+	rules []*Rule
+	// applyRules indicates the selected rules(filtered by prepareRulesForApply) from the given rules
 	applyRules []*Rule
 }
 
 type ruleList struct {
-	ranges []rangeRules // ranges[i] contains rules apply to (ranges[i].startKey, ranges[i+1].startKey).
+	ranges []rangeRules // ranges[i] contains rules apply to [ranges[i].startKey, ranges[i+1].startKey).
 }
 
+// buildRuleList builds the applied ruleList for the give rules
+// rules indicates the map (rule's GroupID, ID) => rule
 func buildRuleList(rules map[[2]string]*Rule) (ruleList, error) {
 	if len(rules) == 0 {
-		return ruleList{}, errors.New("no rule left")
+		return ruleList{}, errs.ErrBuildRuleList.FastGenByArgs("no rule left")
 	}
 	// collect and sort split points.
 	var points []splitPoint
@@ -107,24 +135,36 @@ func buildRuleList(rules map[[2]string]*Rule) (ruleList, error) {
 			sr.deleteRule(p.rule)
 		}
 		if i == len(points)-1 || !bytes.Equal(p.key, points[i+1].key) {
+			var endKey []byte
+			if i != len(points)-1 {
+				endKey = points[i+1].key
+			}
+
 			// next key is different, push sr to rl.
 			rr := sr.rules
 			if len(rr) == 0 {
-				var endKey []byte
-				if i != len(points)-1 {
-					endKey = points[i+1].key
-				}
-				return ruleList{}, errors.Errorf("no rule for range {%s, %s}",
+				return ruleList{}, errs.ErrBuildRuleList.FastGenByArgs(fmt.Sprintf("no rule for range {%s, %s}",
 					strings.ToUpper(hex.EncodeToString(p.key)),
-					strings.ToUpper(hex.EncodeToString(endKey)))
+					strings.ToUpper(hex.EncodeToString(endKey))))
 			}
+
 			if i != len(points)-1 {
 				rr = append(rr[:0:0], rr...) // clone
 			}
+
+			arr := prepareRulesForApply(rr) // clone internally
+			err := checkApplyRules(arr)
+			if err != nil {
+				return ruleList{}, errs.ErrBuildRuleList.FastGenByArgs(fmt.Sprintf("%s for range {%s, %s}",
+					err,
+					strings.ToUpper(hex.EncodeToString(p.key)),
+					strings.ToUpper(hex.EncodeToString(endKey))))
+			}
+
 			rl.ranges = append(rl.ranges, rangeRules{
 				startKey:   p.key,
 				rules:      rr,
-				applyRules: prepareRulesForApply(rr), // clone internally
+				applyRules: arr,
 			})
 		}
 	}
diff --git a/server/schedule/placement/rule_manager.go b/server/schedule/placement/rule_manager.go
index 41ce43fd11b..3709bbc8bf5 100644
--- a/server/schedule/placement/rule_manager.go
+++ b/server/schedule/placement/rule_manager.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,12 +18,13 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"sort"
 	"strings"
 	"sync"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/server/core"
 	"go.uber.org/zap"
 )
 
@@ -33,15 +34,21 @@ type RuleManager struct {
 	store *core.Storage
 	sync.RWMutex
 	initialized bool
-	rules       map[[2]string]*Rule
-	ruleList    ruleList
+	// Key(RuleGroupID,RuleID) => Rule
+	rules map[[2]string]*Rule
+	// GroupID => RuleGroup
+	groups map[string]*RuleGroup
+	// constructed by rebuildRuleList in runtime, store groups with default configuration
+	defGroups map[string]struct{}
+	ruleList  ruleList
 }
 
 // NewRuleManager creates a RuleManager instance.
 func NewRuleManager(store *core.Storage) *RuleManager {
 	return &RuleManager{
-		store: store,
-		rules: make(map[[2]string]*Rule),
+		store:  store,
+		rules:  make(map[[2]string]*Rule),
+		groups: make(map[string]*RuleGroup),
 	}
 }
 
@@ -57,6 +64,9 @@ func (m *RuleManager) Initialize(maxReplica int, locationLabels []string) error
 	if err := m.loadRules(); err != nil {
 		return err
 	}
+	if err := m.loadGroups(); err != nil {
+		return err
+	}
 	if len(m.rules) == 0 {
 		// migrate from old config.
 		defaultRule := &Rule{
@@ -71,7 +81,7 @@ func (m *RuleManager) Initialize(maxReplica int, locationLabels []string) error
 		}
 		m.rules[defaultRule.Key()] = defaultRule
 	}
-	ruleList, err := buildRuleList(m.rules)
+	ruleList, err := m.rebuildRuleList()
 	if err != nil {
 		return err
 	}
@@ -83,25 +93,25 @@ func (m *RuleManager) Initialize(maxReplica int, locationLabels []string) error
 func (m *RuleManager) loadRules() error {
 	var toSave []*Rule
 	var toDelete []string
-	_, err := m.store.LoadRules(func(k, v string) {
+	err := m.store.LoadRules(func(k, v string) {
 		var r Rule
 		if err := json.Unmarshal([]byte(v), &r); err != nil {
-			log.Error("failed to unmarshal rule value", zap.String("rule-key", k), zap.String("rule-value", v))
+			log.Error("failed to unmarshal rule value", zap.String("rule-key", k), zap.String("rule-value", v), zap.Error(errs.ErrLoadRule.FastGenByArgs()))
 			toDelete = append(toDelete, k)
 			return
 		}
 		if err := m.adjustRule(&r); err != nil {
-			log.Error("rule is in bad format", zap.Error(err), zap.String("rule-key", k), zap.String("rule-value", v))
+			log.Error("rule is in bad format", zap.String("rule-key", k), zap.String("rule-value", v), zap.Error(errs.ErrLoadRule.FastGenByArgs()), zap.NamedError("cause", err))
 			toDelete = append(toDelete, k)
 			return
 		}
 		if _, ok := m.rules[r.Key()]; ok {
-			log.Error("duplicated rule key", zap.String("rule-key", k), zap.String("rule-value", v))
+			log.Error("duplicated rule key", zap.String("rule-key", k), zap.String("rule-value", v), zap.Error(errs.ErrLoadRule.FastGenByArgs()))
 			toDelete = append(toDelete, k)
 			return
 		}
 		if k != r.StoreKey() {
-			log.Error("mismatch data key, need to restore", zap.String("rule-key", k), zap.String("rule-value", v))
+			log.Error("mismatch data key, need to restore", zap.String("rule-key", k), zap.String("rule-value", v), zap.Error(errs.ErrLoadRule.FastGenByArgs()))
 			toDelete = append(toDelete, k)
 			toSave = append(toSave, &r)
 		}
@@ -123,35 +133,49 @@ func (m *RuleManager) loadRules() error {
 	return nil
 }
 
+func (m *RuleManager) loadGroups() error {
+	return m.store.LoadRuleGroups(func(k, v string) {
+		var g RuleGroup
+		if err := json.Unmarshal([]byte(v), &g); err != nil {
+			log.Error("failed to unmarshal rule group", zap.String("group-id", k), zap.Error(errs.ErrLoadRuleGroup.FastGenByArgs()), zap.NamedError("cause", err))
+			return
+		}
+		m.groups[g.ID] = &g
+	})
+}
+
 // check and adjust rule from client or storage.
 func (m *RuleManager) adjustRule(r *Rule) error {
 	var err error
 	r.StartKey, err = hex.DecodeString(r.StartKeyHex)
 	if err != nil {
-		return errors.Wrap(err, "start key is not hex format")
+		return errs.ErrRuleContent.FastGenByArgs("start key is not hex format")
 	}
 	r.EndKey, err = hex.DecodeString(r.EndKeyHex)
 	if err != nil {
-		return errors.Wrap(err, "end key is not hex format")
+		return errs.ErrRuleContent.FastGenByArgs("end key is not hex format")
 	}
 	if len(r.EndKey) > 0 && bytes.Compare(r.EndKey, r.StartKey) <= 0 {
-		return errors.New("endKey should be greater than startKey")
+		return errs.ErrRuleContent.FastGenByArgs("endKey should be greater than startKey")
 	}
 	if r.GroupID == "" {
-		return errors.New("group ID should not be empty")
+		return errs.ErrRuleContent.FastGenByArgs("group ID should not be empty")
 	}
 	if r.ID == "" {
-		return errors.New("ID should not be empty")
+		return errs.ErrRuleContent.FastGenByArgs("ID should not be empty")
 	}
 	if !validateRole(r.Role) {
-		return errors.Errorf("invalid role %s", r.Role)
+		return errs.ErrRuleContent.FastGenByArgs(fmt.Sprintf("invalid role %s", r.Role))
 	}
 	if r.Count <= 0 {
-		return errors.Errorf("invalid count %v", r.Count)
+		return errs.ErrRuleContent.FastGenByArgs(fmt.Sprintf("invalid count %d", r.Count))
+	}
+	if r.Role == Leader && r.Count > 1 {
+		return errs.ErrRuleContent.FastGenByArgs(fmt.Sprintf("define multiple leaders by count %d", r.Count))
 	}
 	for _, c := range r.LabelConstraints {
 		if !validateOp(c.Op) {
-			return errors.Errorf("invalid op %s", c.Op)
+			return errs.ErrRuleContent.FastGenByArgs(fmt.Sprintf("invalid op %s", c.Op))
 		}
 	}
 	return nil
@@ -166,61 +190,18 @@ func (m *RuleManager) GetRule(group, id string) *Rule {
 
 // SetRule inserts or updates a Rule.
 func (m *RuleManager) SetRule(rule *Rule) error {
-	err := m.adjustRule(rule)
-	if err != nil {
-		return err
-	}
-	m.Lock()
-	defer m.Unlock()
-	old := m.rules[rule.Key()]
-	m.rules[rule.Key()] = rule
-
-	ruleList, err := buildRuleList(m.rules)
-	if err == nil {
-		err = m.store.SaveRule(rule.StoreKey(), rule)
-	}
-
-	// restore
-	if err != nil {
-		if old == nil {
-			delete(m.rules, rule.Key())
-		} else {
-			m.rules[old.Key()] = old
-		}
-		return err
-	}
-
-	m.ruleList = ruleList
-	log.Info("placement rule updated", zap.Stringer("rule", rule))
-	return nil
+	return m.Batch([]RuleOp{{
+		Rule:   rule,
+		Action: RuleOpAdd,
+	}})
 }
 
 // DeleteRule removes a Rule.
 func (m *RuleManager) DeleteRule(group, id string) error {
-	m.Lock()
-	defer m.Unlock()
-	key := [2]string{group, id}
-	old, ok := m.rules[key]
-	if !ok {
-		return nil
-	}
-	delete(m.rules, [2]string{group, id})
-
-	ruleList, err := buildRuleList(m.rules)
-	if err != nil {
-		// restore
-		m.rules[key] = old
-		return err
-	}
-
-	if err := m.store.DeleteRule(old.StoreKey()); err != nil {
-		// restore
-		m.rules[key] = old
-		return err
-	}
-	m.ruleList = ruleList
-	log.Info("placement rule removed", zap.Stringer("rule", old))
-	return nil
+	return m.Batch([]RuleOp{{
+		Rule:   &Rule{GroupID: group, ID: id},
+		Action: RuleOpDel,
+	}})
 }
 
 // GetSplitKeys returns all split keys in the range (start, end).
@@ -277,7 +258,7 @@ func (m *RuleManager) FitRegion(stores StoreSet, region *core.RegionInfo) *Regio
 }
 
 func (m *RuleManager) tryBuildSave(oldRules map[[2]string]*Rule) error {
-	ruleList, err := buildRuleList(m.rules)
+	ruleList, err := m.rebuildRuleList()
 	if err == nil {
 		for key := range oldRules {
 			rule := m.rules[key]
@@ -325,28 +306,15 @@ func (m *RuleManager) addRule(rule *Rule, oldRules map[[2]string]*Rule) {
 
 // SetRules inserts or updates lots of Rules at once.
 func (m *RuleManager) SetRules(rules []*Rule) error {
-	for _, rule := range rules {
+	ruleOps := make([]RuleOp, len(rules))
+	for i, rule := range rules {
 		err := m.adjustRule(rule)
 		if err != nil {
 			return err
 		}
+		ruleOps[i] = RuleOp{Rule: rule, Action: RuleOpAdd}
 	}
-
-	m.Lock()
-	defer m.Unlock()
-
-	oldRules := make(map[[2]string]*Rule)
-
-	for _, rule := range rules {
-		m.addRule(rule, oldRules)
-	}
-
-	if err := m.tryBuildSave(oldRules); err != nil {
-		return err
-	}
-
-	log.Info("placement rule updated", zap.String("rules", fmt.Sprint(rules)))
-	return nil
+	return m.Batch(ruleOps)
 }
 
 func (m *RuleManager) delRuleByID(group, id string, oldRules map[[2]string]*Rule) {
@@ -388,6 +356,11 @@ type RuleOp struct {
 	DeleteByIDPrefix bool       `json:"delete_by_id_prefix"` // if action == delete, delete by the prefix of id
 }
 
+func (r RuleOp) String() string {
+	b, _ := json.Marshal(r)
+	return string(b)
+}
+
 // Batch executes a series of actions at once.
 func (m *RuleManager) Batch(todo []RuleOp) error {
 	for _, t := range todo {
@@ -421,3 +394,90 @@ func (m *RuleManager) Batch(todo []RuleOp) error {
 	log.Info("placement rules updated", zap.String("batch", fmt.Sprint(todo)))
 	return nil
 }
+
+func (m *RuleManager) rebuildRuleList() (ruleList, error) {
+	m.defGroups = make(map[string]struct{})
+	for _, r := range m.rules {
+		r.group = m.groups[r.GroupID]
+		if r.group == nil {
+			m.defGroups[r.GroupID] = struct{}{}
+		}
+	}
+	rl, err := buildRuleList(m.rules)
+	if err != nil {
+		return ruleList{}, err
+	}
+	return rl, nil
+}
+
+// GetRuleGroup returns a RuleGroup configuration.
+func (m *RuleManager) GetRuleGroup(id string) *RuleGroup {
+	m.RLock()
+	defer m.RUnlock()
+	if _, ok := m.defGroups[id]; ok {
+		return &RuleGroup{ID: id}
+	}
+	return m.groups[id]
+}
+
+// GetRuleGroups returns all RuleGroup configuration.
+func (m *RuleManager) GetRuleGroups() []*RuleGroup {
+	m.RLock()
+	defer m.RUnlock()
+	var groups []*RuleGroup
+	for _, g := range m.groups {
+		groups = append(groups, g)
+	}
+	for id := range m.defGroups {
+		groups = append(groups, &RuleGroup{ID: id})
+	}
+	sort.Slice(groups, func(i, j int) bool {
+		return groups[i].Index < groups[j].Index ||
+			(groups[i].Index == groups[j].Index && groups[i].ID < groups[j].ID)
+	})
+	return groups
+}
+
+// SetRuleGroup updates a RuleGroup.
+func (m *RuleManager) SetRuleGroup(group *RuleGroup) error {
+	m.Lock()
+	defer m.Unlock()
+	return m.tryUpdateGroup(group.ID, group)
+}
+
+// DeleteRuleGroup removes a RuleGroup.
+func (m *RuleManager) DeleteRuleGroup(id string) error {
+	m.Lock()
+	defer m.Unlock()
+	return m.tryUpdateGroup(id, nil)
+}
+
+func (m *RuleManager) tryUpdateGroup(id string, newGroup *RuleGroup) error {
+	oldGroup := m.groups[id]
+
+	if newGroup != nil {
+		m.groups[id] = newGroup
+	} else {
+		delete(m.groups, id)
+	}
+
+	rl, err := m.rebuildRuleList()
+	if err == nil {
+		if newGroup != nil {
+			err = m.store.SaveRuleGroup(id, newGroup)
+		} else {
+			err = m.store.DeleteRuleGroup(id)
+		}
+	}
+	if err != nil {
+		// recover old:
+		if oldGroup != nil {
+			m.groups[id] = oldGroup
+		} else {
+			delete(m.groups, id)
+		}
+		return err
+	}
+	m.ruleList = rl
+	return nil
+}
diff --git a/server/schedule/placement/rule_manager_test.go b/server/schedule/placement/rule_manager_test.go
index 117a69a095a..b5806a43633 100644
--- a/server/schedule/placement/rule_manager_test.go
+++ b/server/schedule/placement/rule_manager_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/kv"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/kv"
 )
 
 var _ = Suite(&testManagerSuite{})
@@ -70,22 +70,45 @@ func (s *testManagerSuite) TestAdjustRule(c *C) {
 	}
 }
 
+func (s *testManagerSuite) TestLeaderCheck(c *C) {
+	c.Assert(s.manager.SetRule(&Rule{GroupID: "pd", ID: "default", Role: "learner", Count: 3}), ErrorMatches, ".*needs at least one leader or voter.*")
+	c.Assert(s.manager.SetRule(&Rule{GroupID: "g2", ID: "33", Role: "leader", Count: 2}), ErrorMatches, ".*define multiple leaders by count 2.*")
+	c.Assert(s.manager.Batch([]RuleOp{
+		{
+			Rule:   &Rule{GroupID: "g2", ID: "foo1", Role: "leader", Count: 1},
+			Action: RuleOpAdd,
+		},
+		{
+			Rule:   &Rule{GroupID: "g2", ID: "foo2", Role: "leader", Count: 1},
+			Action: RuleOpAdd,
+		},
+	}), ErrorMatches, ".*multiple leader replicas.*")
+}
+
 func (s *testManagerSuite) TestSaveLoad(c *C) {
 	rules := []*Rule{
 		{GroupID: "pd", ID: "default", Role: "voter", Count: 5},
-		{GroupID: "foo", ID: "bar", StartKeyHex: "", EndKeyHex: "abcd", Role: "learner", Count: 1},
-		{GroupID: "foo", ID: "baz", Role: "voter", Count: 1},
+		{GroupID: "foo", ID: "baz", StartKeyHex: "", EndKeyHex: "abcd", Role: "voter", Count: 1},
+		{GroupID: "foo", ID: "bar", Role: "learner", Count: 1},
 	}
 	for _, r := range rules {
-		s.manager.SetRule(r)
+		c.Assert(s.manager.SetRule(r), IsNil)
 	}
+
 	m2 := NewRuleManager(s.store)
 	err := m2.Initialize(3, []string{"no", "labels"})
 	c.Assert(err, IsNil)
 	c.Assert(m2.GetAllRules(), HasLen, 3)
 	c.Assert(m2.GetRule("pd", "default"), DeepEquals, rules[0])
-	c.Assert(m2.GetRule("foo", "bar"), DeepEquals, rules[1])
-	c.Assert(m2.GetRule("foo", "baz"), DeepEquals, rules[2])
+	c.Assert(m2.GetRule("foo", "baz"), DeepEquals, rules[1])
+	c.Assert(m2.GetRule("foo", "bar"), DeepEquals, rules[2])
+}
+
+func (s *testManagerSuite) checkRules(c *C, rules []*Rule, expect [][2]string) {
+	c.Assert(rules, HasLen, len(expect))
+	for i := range rules {
+		c.Assert(rules[i].Key(), DeepEquals, expect[i])
+	}
 }
 
 func (s *testManagerSuite) TestKeys(c *C) {
@@ -104,13 +127,17 @@ func (s *testManagerSuite) TestKeys(c *C) {
 			DeleteByIDPrefix: false,
 		})
 	}
+	s.checkRules(c, s.manager.GetAllRules(), [][2]string{{"1", "1"}, {"2", "2"}, {"2", "3"}, {"pd", "default"}})
 	s.manager.Batch(toDelete)
+	s.checkRules(c, s.manager.GetAllRules(), [][2]string{{"pd", "default"}})
 
 	rules = append(rules, &Rule{GroupID: "3", ID: "4", Role: "voter", Count: 1, StartKeyHex: "44", EndKeyHex: "ee"},
 		&Rule{GroupID: "3", ID: "5", Role: "voter", Count: 1, StartKeyHex: "44", EndKeyHex: "dd"})
 	s.manager.SetRules(rules)
+	s.checkRules(c, s.manager.GetAllRules(), [][2]string{{"1", "1"}, {"2", "2"}, {"2", "3"}, {"3", "4"}, {"3", "5"}, {"pd", "default"}})
 
 	s.manager.DeleteRule("pd", "default")
+	s.checkRules(c, s.manager.GetAllRules(), [][2]string{{"1", "1"}, {"2", "2"}, {"2", "3"}, {"3", "4"}, {"3", "5"}})
 
 	splitKeys := [][]string{
 		{"", "", "11", "22", "44", "dd", "ee", "ff"},
@@ -172,6 +199,24 @@ func (s *testManagerSuite) TestKeys(c *C) {
 	}
 }
 
+func (s *testManagerSuite) TestDeleteByIDPrefix(c *C) {
+	s.manager.SetRules([]*Rule{
+		{GroupID: "g1", ID: "foo1", Role: "voter", Count: 1},
+		{GroupID: "g2", ID: "foo1", Role: "voter", Count: 1},
+		{GroupID: "g2", ID: "foobar", Role: "voter", Count: 1},
+		{GroupID: "g2", ID: "baz2", Role: "voter", Count: 1},
+	})
+	s.manager.DeleteRule("pd", "default")
+	s.checkRules(c, s.manager.GetAllRules(), [][2]string{{"g1", "foo1"}, {"g2", "baz2"}, {"g2", "foo1"}, {"g2", "foobar"}})
+
+	s.manager.Batch([]RuleOp{{
+		Rule:             &Rule{GroupID: "g2", ID: "foo"},
+		Action:           RuleOpDel,
+		DeleteByIDPrefix: true,
+	}})
+	s.checkRules(c, s.manager.GetAllRules(), [][2]string{{"g1", "foo1"}, {"g2", "baz2"}})
+}
+
 func (s *testManagerSuite) TestRangeGap(c *C) {
 	// |--  default  --|
 	// cannot delete the last rule
@@ -195,6 +240,103 @@ func (s *testManagerSuite) TestRangeGap(c *C) {
 	c.Assert(err, NotNil)
 }
 
+func (s *testManagerSuite) TestGroupConfig(c *C) {
+	// group pd
+	pd1 := &RuleGroup{ID: "pd"}
+	c.Assert(s.manager.GetRuleGroup("pd"), DeepEquals, pd1)
+
+	// update group pd
+	pd2 := &RuleGroup{ID: "pd", Index: 100, Override: true}
+	err := s.manager.SetRuleGroup(pd2)
+	c.Assert(err, IsNil)
+	c.Assert(s.manager.GetRuleGroup("pd"), DeepEquals, pd2)
+
+	// new group g without config
+	err = s.manager.SetRule(&Rule{GroupID: "g", ID: "1", Role: "voter", Count: 1})
+	c.Assert(err, IsNil)
+	g1 := &RuleGroup{ID: "g"}
+	c.Assert(s.manager.GetRuleGroup("g"), DeepEquals, g1)
+	c.Assert(s.manager.GetRuleGroups(), DeepEquals, []*RuleGroup{g1, pd2})
+
+	// update group g
+	g2 := &RuleGroup{ID: "g", Index: 2, Override: true}
+	err = s.manager.SetRuleGroup(g2)
+	c.Assert(err, IsNil)
+	c.Assert(s.manager.GetRuleGroups(), DeepEquals, []*RuleGroup{g2, pd2})
+
+	// delete pd group, restore to default config
+	err = s.manager.DeleteRuleGroup("pd")
+	c.Assert(err, IsNil)
+	c.Assert(s.manager.GetRuleGroups(), DeepEquals, []*RuleGroup{pd1, g2})
+
+	// delete rule, the group is removed too
+	err = s.manager.DeleteRule("pd", "default")
+	c.Assert(err, IsNil)
+	c.Assert(s.manager.GetRuleGroups(), DeepEquals, []*RuleGroup{g2})
+}
+
+func (s *testManagerSuite) TestCheckApplyRules(c *C) {
+	err := checkApplyRules([]*Rule{
+		{
+			Role:  Leader,
+			Count: 1,
+		},
+	})
+	c.Assert(err, IsNil)
+
+	err = checkApplyRules([]*Rule{
+		{
+			Role:  Voter,
+			Count: 1,
+		},
+	})
+	c.Assert(err, IsNil)
+
+	err = checkApplyRules([]*Rule{
+		{
+			Role:  Leader,
+			Count: 1,
+		},
+		{
+			Role:  Voter,
+			Count: 1,
+		},
+	})
+	c.Assert(err, IsNil)
+
+	err = checkApplyRules([]*Rule{
+		{
+			Role:  Leader,
+			Count: 3,
+		},
+	})
+	c.Assert(err, ErrorMatches, "multiple leader replicas")
+
+	err = checkApplyRules([]*Rule{
+		{
+			Role:  Leader,
+			Count: 1,
+		},
+		{
+			Role:  Leader,
+			Count: 1,
+		},
+	})
+	c.Assert(err, ErrorMatches, "multiple leader replicas")
+
+	err = checkApplyRules([]*Rule{
+		{
+			Role:  Learner,
+			Count: 1,
+		},
+		{
+			Role:  Follower,
+			Count: 1,
+		},
+	})
+	c.Assert(err, ErrorMatches, "needs at least one leader or voter")
+}
+
 func (s *testManagerSuite) dhex(hk string) []byte {
 	k, err := hex.DecodeString(hk)
 	if err != nil {
diff --git a/server/schedule/placement/rule_test.go b/server/schedule/placement/rule_test.go
index bee3f3a0734..9efac17166e 100644
--- a/server/schedule/placement/rule_test.go
+++ b/server/schedule/placement/rule_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 package placement
 
 import (
+	"encoding/hex"
 	"math/rand"
 
 	. "github.com/pingcap/check"
@@ -59,3 +60,130 @@ func (s *testRuleSuite) TestPrepareRulesForApply(c *C) {
 		c.Assert(rules[i].Key(), Equals, expected[i])
 	}
 }
+
+func (s *testRuleSuite) TestGroupProperties(c *C) {
+	testCases := []struct {
+		rules  []*Rule
+		expect [][2]string
+	}{
+		{
+			rules: []*Rule{
+				{GroupID: "g1", ID: "id1"},
+				{GroupID: "g2", ID: "id2"},
+			},
+			expect: [][2]string{
+				{"g1", "id1"}, {"g2", "id2"},
+			},
+		},
+		{ // test group index
+			rules: []*Rule{
+				{GroupID: "g1", ID: "id1"},
+				{GroupID: "g2", ID: "id2", group: &RuleGroup{ID: "g2", Index: 2}},
+				{GroupID: "g3", ID: "id3", group: &RuleGroup{ID: "g3", Index: 1}},
+			},
+			expect: [][2]string{
+				{"g1", "id1"}, {"g3", "id3"}, {"g2", "id2"},
+			},
+		},
+		{ // test group override
+			rules: []*Rule{
+				{GroupID: "g1", ID: "id1"},
+				{GroupID: "g2", ID: "id2"},
+				{GroupID: "g3", ID: "id3", group: &RuleGroup{ID: "g3", Index: 1, Override: true}},
+				{GroupID: "g4", ID: "id4", group: &RuleGroup{ID: "g4", Index: 2}},
+			},
+			expect: [][2]string{
+				{"g3", "id3"}, {"g4", "id4"},
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		rand.Shuffle(len(tc.rules), func(i, j int) { tc.rules[i], tc.rules[j] = tc.rules[j], tc.rules[i] })
+		sortRules(tc.rules)
+		rules := prepareRulesForApply(tc.rules)
+		c.Assert(rules, HasLen, len(tc.expect))
+		for i := range rules {
+			c.Assert(rules[i].Key(), Equals, tc.expect[i])
+		}
+	}
+}
+
+// TODO: fulfill unit test case to cover BuildRuleList
+func (s *testRuleSuite) TestBuildRuleList(c *C) {
+	defaultRule := &Rule{
+		GroupID:  "pd",
+		ID:       "default",
+		Role:     "voter",
+		StartKey: []byte{},
+		EndKey:   []byte{},
+		Count:    3,
+	}
+	byteStart, err := hex.DecodeString("a1")
+	c.Check(err, IsNil)
+	byteEnd, err := hex.DecodeString("a2")
+	c.Check(err, IsNil)
+	ruleMeta := &Rule{
+		GroupID:  "pd",
+		ID:       "meta",
+		Index:    1,
+		Override: true,
+		StartKey: byteStart,
+		EndKey:   byteEnd,
+		Role:     "voter",
+		Count:    5,
+	}
+
+	testcases := []struct {
+		name   string
+		rules  map[[2]string]*Rule
+		expect ruleList
+	}{
+		{
+			name: "default rule",
+			rules: map[[2]string]*Rule{
+				{"pd", "default"}: defaultRule,
+			},
+			expect: ruleList{
+				ranges: []rangeRules{
+					{
+						startKey:   []byte{},
+						rules:      []*Rule{defaultRule},
+						applyRules: []*Rule{defaultRule},
+					},
+				},
+			},
+		},
+		{
+			name: "metadata case",
+			rules: map[[2]string]*Rule{
+				{"pd", "default"}: defaultRule,
+				{"pd", "meta"}:    ruleMeta,
+			},
+			expect: ruleList{ranges: []rangeRules{
+				{
+					startKey:   []byte{},
+					rules:      []*Rule{defaultRule},
+					applyRules: []*Rule{defaultRule},
+				},
+				{
+					startKey:   byteStart,
+					rules:      []*Rule{defaultRule, ruleMeta},
+					applyRules: []*Rule{ruleMeta},
+				},
+				{
+					startKey:   byteEnd,
+					rules:      []*Rule{defaultRule},
+					applyRules: []*Rule{defaultRule},
+				},
+			}},
+		},
+	}
+
+	for _, testcase := range testcases {
+		c.Log(testcase.name)
+		result, err := buildRuleList(testcase.rules)
+		c.Assert(err, IsNil)
+		c.Assert(result, DeepEquals, testcase.expect)
+	}
+}
diff --git a/server/schedule/plugin_interface.go b/server/schedule/plugin_interface.go
index 32d140beff5..10e54066580 100644
--- a/server/schedule/plugin_interface.go
+++ b/server/schedule/plugin_interface.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/schedule/range_cluster.go b/server/schedule/range_cluster.go
index 61492878b15..50051743ba8 100644
--- a/server/schedule/range_cluster.go
+++ b/server/schedule/range_cluster.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@ package schedule
 import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/opt"
 )
 
 // RangeCluster isolates the cluster by range.
diff --git a/server/schedule/region_scatterer.go b/server/schedule/region_scatterer.go
index 2a21545633e..3c12bef41aa 100644
--- a/server/schedule/region_scatterer.go
+++ b/server/schedule/region_scatterer.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,13 +18,13 @@ import (
 	"math/rand"
 	"sync"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 	"go.uber.org/zap"
 )
 
@@ -127,6 +127,7 @@ func newEngineContext(filters ...filter.Filter) engineContext {
 // Scatter relocates the region.
 func (r *RegionScatterer) Scatter(region *core.RegionInfo) (*operator.Operator, error) {
 	if !opt.IsRegionReplicated(r.cluster, region) {
+		r.cluster.AddSuspectRegions(region.GetID())
 		return nil, errors.Errorf("region %d is not fully replicated", region.GetID())
 	}
 
@@ -226,8 +227,8 @@ func (r *RegionScatterer) selectPeerToReplace(stores map[uint64]*core.StoreInfo,
 
 	target := candidates[rand.Intn(len(candidates))]
 	return &metapb.Peer{
-		StoreId:   target.GetID(),
-		IsLearner: oldPeer.GetIsLearner(),
+		StoreId: target.GetID(),
+		Role:    oldPeer.GetRole(),
 	}
 }
 
diff --git a/server/schedule/region_scatterer_test.go b/server/schedule/region_scatterer_test.go
index 9e754763385..56cd989eb6b 100644
--- a/server/schedule/region_scatterer_test.go
+++ b/server/schedule/region_scatterer_test.go
@@ -4,11 +4,12 @@ import (
 	"context"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/pkg/mock/mockhbstream"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockhbstream"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/placement"
 )
 
 type sequencer struct {
@@ -227,3 +228,46 @@ func (s *testScatterRegionSuite) TestStoreLimit(c *C) {
 		}
 	}
 }
+
+func (s *testScatterRegionSuite) TestScatterCheck(c *C) {
+	opt := mockoption.NewScheduleOptions()
+	tc := mockcluster.NewCluster(opt)
+	// Add 5 stores.
+	for i := uint64(1); i <= 5; i++ {
+		tc.AddRegionStore(i, 0)
+	}
+	testcases := []struct {
+		name        string
+		checkRegion *core.RegionInfo
+		needFix     bool
+	}{
+		{
+			name:        "region with 4 replicas",
+			checkRegion: tc.AddLeaderRegion(1, 1, 2, 3, 4),
+			needFix:     true,
+		},
+		{
+			name:        "region with 3 replicas",
+			checkRegion: tc.AddLeaderRegion(1, 1, 2, 3),
+			needFix:     false,
+		},
+		{
+			name:        "region with 2 replicas",
+			checkRegion: tc.AddLeaderRegion(1, 1, 2),
+			needFix:     true,
+		},
+	}
+	for _, testcase := range testcases {
+		c.Logf(testcase.name)
+		scatterer := NewRegionScatterer(tc)
+		_, err := scatterer.Scatter(testcase.checkRegion)
+		if testcase.needFix {
+			c.Assert(err, NotNil)
+			c.Assert(tc.CheckRegionUnderSuspect(1), Equals, true)
+		} else {
+			c.Assert(err, IsNil)
+			c.Assert(tc.CheckRegionUnderSuspect(1), Equals, false)
+		}
+		tc.ResetSuspectRegions()
+	}
+}
diff --git a/server/schedule/scheduler.go b/server/schedule/scheduler.go
index 91d835a2f82..30b3aca6034 100644
--- a/server/schedule/scheduler.go
+++ b/server/schedule/scheduler.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 	"go.uber.org/zap"
 )
 
diff --git a/server/schedule/storelimit/store_limit.go b/server/schedule/storelimit/store_limit.go
index fcc3b9bb723..ff45a7630ff 100644
--- a/server/schedule/storelimit/store_limit.go
+++ b/server/schedule/storelimit/store_limit.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/schedule/storelimit/store_limit_scenes.go b/server/schedule/storelimit/store_limit_scenes.go
index c855353cd8b..f9176300a67 100644
--- a/server/schedule/storelimit/store_limit_scenes.go
+++ b/server/schedule/storelimit/store_limit_scenes.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/schedule/test_util.go b/server/schedule/test_util.go
index 019901a38c0..5b2d1247732 100644
--- a/server/schedule/test_util.go
+++ b/server/schedule/test_util.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@ package schedule
 
 import (
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/operator"
 )
 
 // ApplyOperatorStep applies operator step. Only for test purpose.
@@ -58,9 +58,9 @@ func ApplyOperatorStep(region *core.RegionInfo, op *operator.Operator) *core.Reg
 				panic("Add learner that exists")
 			}
 			peer := &metapb.Peer{
-				Id:        s.PeerID,
-				StoreId:   s.ToStore,
-				IsLearner: true,
+				Id:      s.PeerID,
+				StoreId: s.ToStore,
+				Role:    metapb.PeerRole_Learner,
 			}
 			region = region.Clone(core.WithAddPeer(peer))
 		case operator.AddLightLearner:
@@ -68,9 +68,9 @@ func ApplyOperatorStep(region *core.RegionInfo, op *operator.Operator) *core.Reg
 				panic("Add learner that exists")
 			}
 			peer := &metapb.Peer{
-				Id:        s.PeerID,
-				StoreId:   s.ToStore,
-				IsLearner: true,
+				Id:      s.PeerID,
+				StoreId: s.ToStore,
+				Role:    metapb.PeerRole_Learner,
 			}
 			region = region.Clone(core.WithAddPeer(peer))
 		case operator.PromoteLearner:
diff --git a/server/schedule/waiting_operator.go b/server/schedule/waiting_operator.go
index 530e559899f..3e8368dfcdc 100644
--- a/server/schedule/waiting_operator.go
+++ b/server/schedule/waiting_operator.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/pingcap/pd/v4/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/operator"
 )
 
 // PriorityWeight is used to represent the weight of different priorities of operators.
diff --git a/server/schedule/waiting_operator_test.go b/server/schedule/waiting_operator_test.go
index b0473d637ab..2e12f32eb87 100644
--- a/server/schedule/waiting_operator_test.go
+++ b/server/schedule/waiting_operator_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@ package schedule
 import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/operator"
 )
 
 var _ = Suite(&testWaitingOperatorSuite{})
diff --git a/server/schedulers/adjacent_region.go b/server/schedulers/adjacent_region.go
index c45aa12158b..5653592e40a 100644
--- a/server/schedulers/adjacent_region.go
+++ b/server/schedulers/adjacent_region.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,14 +18,14 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 	"go.uber.org/zap"
 )
 
@@ -70,6 +70,7 @@ func init() {
 
 	schedule.RegisterScheduler(AdjacentRegionType, func(opController *schedule.OperatorController, storage *core.Storage, decoder schedule.ConfigDecoder) (schedule.Scheduler, error) {
 		conf := &balanceAdjacentRegionConfig{
+			Name:        AdjacentRegionName,
 			LeaderLimit: defaultAdjacentLeaderLimit,
 			PeerLimit:   defaultAdjacentPeerLimit,
 		}
diff --git a/server/schedulers/balance_leader.go b/server/schedulers/balance_leader.go
index a9b86654edd..b2dfaa79065 100644
--- a/server/schedulers/balance_leader.go
+++ b/server/schedulers/balance_leader.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,14 +17,14 @@ import (
 	"sort"
 	"strconv"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 	"go.uber.org/zap"
 )
 
diff --git a/server/schedulers/balance_region.go b/server/schedulers/balance_region.go
index 2a201aa4962..db61d3c43ae 100644
--- a/server/schedulers/balance_region.go
+++ b/server/schedulers/balance_region.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,15 +17,15 @@ import (
 	"sort"
 	"strconv"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 	"go.uber.org/zap"
 )
 
@@ -217,7 +217,7 @@ func (s *balanceRegionScheduler) transferPeer(cluster opt.Cluster, region *core.
 			continue
 		}
 
-		newPeer := &metapb.Peer{StoreId: target.GetID(), IsLearner: oldPeer.IsLearner}
+		newPeer := &metapb.Peer{StoreId: target.GetID(), Role: oldPeer.Role}
 		op, err := operator.CreateMovePeerOperator("balance-region", cluster, region, operator.OpRegion, oldPeer.GetStoreId(), newPeer)
 		if err != nil {
 			schedulerCounter.WithLabelValues(s.GetName(), "create-operator-fail").Inc()
diff --git a/server/schedulers/balance_test.go b/server/schedulers/balance_test.go
index 29c293ee389..bf7e172ce00 100644
--- a/server/schedulers/balance_test.go
+++ b/server/schedulers/balance_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,14 +21,14 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/pkg/mock/mockhbstream"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/kv"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockhbstream"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/kv"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/operator"
 )
 
 func newTestReplication(mso *mockoption.ScheduleOptions, maxReplicas int, locationLabels ...string) {
@@ -862,7 +862,7 @@ func (s *testBalanceRegionSchedulerSuite) TestOpInfluence(c *C) {
 	for i := 1; i <= 8; i++ {
 		id, _ := tc.Alloc()
 		origin := tc.AddLeaderRegion(id, 4)
-		newPeer := &metapb.Peer{StoreId: 3, IsLearner: false}
+		newPeer := &metapb.Peer{StoreId: 3, Role: metapb.PeerRole_Voter}
 		op, _ := operator.CreateMovePeerOperator("balance-region", tc, origin, operator.OpKind(0), 4, newPeer)
 		c.Assert(op, NotNil)
 		oc.AddOperator(op)
diff --git a/server/schedulers/base_scheduler.go b/server/schedulers/base_scheduler.go
index 362a98d5ae2..162a8c7b3f2 100644
--- a/server/schedulers/base_scheduler.go
+++ b/server/schedulers/base_scheduler.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,8 +19,9 @@ import (
 	"time"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/opt"
 )
 
 // options for interval of schedulers
@@ -44,9 +45,9 @@ const (
 func intervalGrow(x time.Duration, maxInterval time.Duration, typ intervalGrowthType) time.Duration {
 	switch typ {
 	case exponentialGrowth:
-		return minDuration(time.Duration(float64(x)*ScheduleIntervalFactor), maxInterval)
+		return typeutil.MinDuration(time.Duration(float64(x)*ScheduleIntervalFactor), maxInterval)
 	case linearGrowth:
-		return minDuration(x+MinSlowScheduleInterval, maxInterval)
+		return typeutil.MinDuration(x+MinSlowScheduleInterval, maxInterval)
 	case zeroGrowth:
 		return x
 	default:
diff --git a/server/schedulers/evict_leader.go b/server/schedulers/evict_leader.go
index 537a3548669..14d24c46742 100644
--- a/server/schedulers/evict_leader.go
+++ b/server/schedulers/evict_leader.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,14 +19,14 @@ import (
 	"sync"
 
 	"github.com/gorilla/mux"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 	"github.com/unrolled/render"
 	"go.uber.org/zap"
 )
@@ -119,8 +119,7 @@ func (conf *evictLeaderSchedulerConfig) Persist() error {
 	if err != nil {
 		return err
 	}
-	conf.storage.SaveScheduleConfig(name, data)
-	return nil
+	return conf.storage.SaveScheduleConfig(name, data)
 }
 
 func (conf *evictLeaderSchedulerConfig) getSchedulerName() string {
diff --git a/server/schedulers/grant_leader.go b/server/schedulers/grant_leader.go
index 7e3c8554cba..9f247e090db 100644
--- a/server/schedulers/grant_leader.go
+++ b/server/schedulers/grant_leader.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@ import (
 	"sync"
 
 	"github.com/gorilla/mux"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 	"github.com/unrolled/render"
 	"go.uber.org/zap"
 )
@@ -114,8 +114,7 @@ func (conf *grantLeaderSchedulerConfig) Persist() error {
 	if err != nil {
 		return err
 	}
-	conf.storage.SaveScheduleConfig(name, data)
-	return nil
+	return conf.storage.SaveScheduleConfig(name, data)
 }
 
 func (conf *grantLeaderSchedulerConfig) getSchedulerName() string {
diff --git a/server/schedulers/hot_region.go b/server/schedulers/hot_region.go
index bec83391c4e..cdceb62cf88 100644
--- a/server/schedulers/hot_region.go
+++ b/server/schedulers/hot_region.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,13 +25,13 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/statistics"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/statistics"
 	"go.uber.org/zap"
 )
 
@@ -536,9 +536,7 @@ func (bs *balanceSolver) init() {
 	case readLeader:
 		bs.stLoadDetail = bs.sche.stLoadInfos[readLeader]
 	}
-	for _, id := range getUnhealthyStores(bs.cluster) {
-		delete(bs.stLoadDetail, id)
-	}
+	// And it will be unnecessary to filter unhealthy store, because it has been solved in process heartbeat
 
 	bs.maxSrc = &storeLoad{}
 	bs.minDst = &storeLoad{
@@ -561,18 +559,6 @@ func (bs *balanceSolver) init() {
 	}
 }
 
-func getUnhealthyStores(cluster opt.Cluster) []uint64 {
-	ret := make([]uint64, 0)
-	stores := cluster.GetStores()
-	for _, store := range stores {
-		if store.IsTombstone() ||
-			store.DownTime() > cluster.GetMaxStoreDownTime() {
-			ret = append(ret, store.GetID())
-		}
-	}
-	return ret
-}
-
 func newBalanceSolver(sche *hotScheduler, cluster opt.Cluster, rwTy rwType, opTy opType) *balanceSolver {
 	solver := &balanceSolver{
 		sche:    sche,
@@ -1061,7 +1047,7 @@ func (bs *balanceSolver) buildOperators() ([]*operator.Operator, []Influence) {
 	switch bs.opTy {
 	case movePeer:
 		srcPeer := bs.cur.region.GetStorePeer(bs.cur.srcStoreID) // checked in getRegionAndSrcPeer
-		dstPeer := &metapb.Peer{StoreId: bs.cur.dstStoreID, IsLearner: srcPeer.IsLearner}
+		dstPeer := &metapb.Peer{StoreId: bs.cur.dstStoreID, Role: srcPeer.Role}
 		op, err = operator.CreateMovePeerOperator(
 			"move-hot-"+bs.rwTy.String()+"-region",
 			bs.cluster,
diff --git a/server/schedulers/hot_region_config.go b/server/schedulers/hot_region_config.go
index af6e5f8de67..42f4b14b57d 100644
--- a/server/schedulers/hot_region_config.go
+++ b/server/schedulers/hot_region_config.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/statistics"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/statistics"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/schedulers/hot_test.go b/server/schedulers/hot_test.go
index e3a0d24622a..c205ed7b725 100644
--- a/server/schedulers/hot_test.go
+++ b/server/schedulers/hot_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,15 +20,15 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/kv"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
-	"github.com/pingcap/pd/v4/server/statistics"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/kv"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/placement"
+	"github.com/tikv/pd/server/statistics"
 )
 
 func init() {
diff --git a/server/schedulers/label.go b/server/schedulers/label.go
index 9bcc91825f1..52d39920403 100644
--- a/server/schedulers/label.go
+++ b/server/schedulers/label.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
 package schedulers
 
 import (
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 	"go.uber.org/zap"
 )
 
diff --git a/server/schedulers/metrics.go b/server/schedulers/metrics.go
index 768a5c1d92a..1bd0b9dd125 100644
--- a/server/schedulers/metrics.go
+++ b/server/schedulers/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/schedulers/random_merge.go b/server/schedulers/random_merge.go
index 439eda2bb02..125f207efdc 100644
--- a/server/schedulers/random_merge.go
+++ b/server/schedulers/random_merge.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@ package schedulers
 import (
 	"math/rand"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/checker"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/checker"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 	"go.uber.org/zap"
 )
 
diff --git a/server/schedulers/scatter_range.go b/server/schedulers/scatter_range.go
index 0af9fbf3e82..d52a08ff118 100644
--- a/server/schedulers/scatter_range.go
+++ b/server/schedulers/scatter_range.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@ import (
 	"sync"
 
 	"github.com/gorilla/mux"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 	"github.com/unrolled/render"
 )
 
@@ -110,8 +110,7 @@ func (conf *scatterRangeSchedulerConfig) Persist() error {
 	if err != nil {
 		return err
 	}
-	conf.storage.SaveScheduleConfig(name, data)
-	return nil
+	return conf.storage.SaveScheduleConfig(name, data)
 }
 
 func (conf *scatterRangeSchedulerConfig) GetRangeName() string {
diff --git a/server/schedulers/scheduler_test.go b/server/schedulers/scheduler_test.go
index 6105060c993..cf42691a98c 100644
--- a/server/schedulers/scheduler_test.go
+++ b/server/schedulers/scheduler_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,20 +15,31 @@ package schedulers
 
 import (
 	"context"
+	"testing"
+
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockcluster"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/kv"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
-	"github.com/pingcap/pd/v4/server/statistics"
+	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/kv"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/schedule/placement"
+	"github.com/tikv/pd/server/statistics"
+)
+
+const (
+	KB = 1024
+	MB = 1024 * KB
 )
 
+func Test(t *testing.T) {
+	TestingT(t)
+}
+
 var _ = Suite(&testShuffleLeaderSuite{})
 
 type testShuffleLeaderSuite struct{}
@@ -402,7 +413,7 @@ func (s *testShuffleRegionSuite) TestRole(c *C) {
 	peers := []*metapb.Peer{
 		{Id: 1, StoreId: 1},
 		{Id: 2, StoreId: 2},
-		{Id: 3, StoreId: 3, IsLearner: true},
+		{Id: 3, StoreId: 3, Role: metapb.PeerRole_Learner},
 	}
 	region := core.NewRegionInfo(&metapb.Region{
 		Id:          1,
@@ -545,42 +556,97 @@ func (s *testBalanceLeaderSchedulerWithRuleEnabledSuite) schedule() []*operator.
 }
 
 func (s *testBalanceLeaderSchedulerWithRuleEnabledSuite) TestBalanceLeaderWithConflictRule(c *C) {
-	rule := placement.Rule{
-		GroupID:  "test",
-		ID:       "1",
-		Index:    1,
-		StartKey: []byte(""),
-		EndKey:   []byte(""),
-		Role:     placement.Leader,
-		Count:    1,
-		LabelConstraints: []placement.LabelConstraint{
-			{
-				Key:    "role",
-				Op:     placement.In,
-				Values: []string{"leader"},
-			},
-		},
-		LocationLabels: []string{"host"},
-	}
-	c.Check(s.tc.SetRule(&rule), IsNil)
-	c.Check(s.tc.DeleteRule("pd", "default"), IsNil)
-
-	// Stores:     1    2    3    4
-	// Leaders:    1    0    0    0
-	// Region1:    L    F    F    F
+	// Stores:     1    2    3
+	// Leaders:    1    0    0
+	// Region1:    L    F    F
 	s.tc.AddLeaderStore(1, 1)
 	s.tc.AddLeaderStore(2, 0)
 	s.tc.AddLeaderStore(3, 0)
-	s.tc.AddLeaderStore(4, 0)
-	s.tc.AddLeaderRegion(1, 1, 2, 3, 4)
-	s.tc.AddLabelsStore(1, 1, map[string]string{
-		"role": "leader",
+	s.tc.AddLeaderRegion(1, 1, 2, 3)
+	s.tc.SetStoreLabel(1, map[string]string{
+		"host": "a",
+	})
+	s.tc.SetStoreLabel(2, map[string]string{
+		"host": "b",
+	})
+	s.tc.SetStoreLabel(3, map[string]string{
+		"host": "c",
 	})
-	c.Check(s.schedule(), IsNil)
 
-	// Stores:     1    2    3    4
-	// Leaders:    16   0    0    0
-	// Region1:    L    F    F    F
+	// Stores:     1    2    3
+	// Leaders:    16   0    0
+	// Region1:    L    F    F
 	s.tc.UpdateLeaderCount(1, 16)
-	c.Check(s.schedule(), IsNil)
+	testcases := []struct {
+		name     string
+		rule     placement.Rule
+		schedule bool
+	}{
+		{
+			name: "default Rule",
+			rule: placement.Rule{
+				GroupID:        "pd",
+				ID:             "default",
+				Index:          1,
+				StartKey:       []byte(""),
+				EndKey:         []byte(""),
+				Role:           placement.Voter,
+				Count:          3,
+				LocationLabels: []string{"host"},
+			},
+			schedule: true,
+		},
+		{
+			name: "single store allowed to be placed leader",
+			rule: placement.Rule{
+				GroupID:  "pd",
+				ID:       "default",
+				Index:    1,
+				StartKey: []byte(""),
+				EndKey:   []byte(""),
+				Role:     placement.Leader,
+				Count:    1,
+				LabelConstraints: []placement.LabelConstraint{
+					{
+						Key:    "host",
+						Op:     placement.In,
+						Values: []string{"a"},
+					},
+				},
+				LocationLabels: []string{"host"},
+			},
+			schedule: false,
+		},
+		{
+			name: "2 store allowed to be placed leader",
+			rule: placement.Rule{
+				GroupID:  "pd",
+				ID:       "default",
+				Index:    1,
+				StartKey: []byte(""),
+				EndKey:   []byte(""),
+				Role:     placement.Leader,
+				Count:    1,
+				LabelConstraints: []placement.LabelConstraint{
+					{
+						Key:    "host",
+						Op:     placement.In,
+						Values: []string{"a", "b"},
+					},
+				},
+				LocationLabels: []string{"host"},
+			},
+			schedule: true,
+		},
+	}
+
+	for _, testcase := range testcases {
+		c.Logf(testcase.name)
+		c.Check(s.tc.SetRule(&testcase.rule), IsNil)
+		if testcase.schedule {
+			c.Check(len(s.schedule()), Equals, 1)
+		} else {
+			c.Check(s.schedule(), IsNil)
+		}
+	}
 }
diff --git a/server/schedulers/shuffle_hot_region.go b/server/schedulers/shuffle_hot_region.go
index a15716ffd25..3dc1706e5b9 100644
--- a/server/schedulers/shuffle_hot_region.go
+++ b/server/schedulers/shuffle_hot_region.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,11 +20,11 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 	"go.uber.org/zap"
 )
 
diff --git a/server/schedulers/shuffle_leader.go b/server/schedulers/shuffle_leader.go
index 11702643f3f..f120d120fe7 100644
--- a/server/schedulers/shuffle_leader.go
+++ b/server/schedulers/shuffle_leader.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
 package schedulers
 
 import (
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 	"go.uber.org/zap"
 )
 
diff --git a/server/schedulers/shuffle_region.go b/server/schedulers/shuffle_region.go
index 450b22b3eb0..fa85ec154dd 100644
--- a/server/schedulers/shuffle_region.go
+++ b/server/schedulers/shuffle_region.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,13 +16,13 @@ package schedulers
 import (
 	"net/http"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/filter"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
 )
 
 const (
@@ -159,5 +159,5 @@ func (s *shuffleRegionScheduler) scheduleAddPeer(cluster opt.Cluster, region *co
 	if target == nil {
 		return nil
 	}
-	return &metapb.Peer{StoreId: target.GetID(), IsLearner: oldPeer.GetIsLearner()}
+	return &metapb.Peer{StoreId: target.GetID(), Role: oldPeer.GetRole()}
 }
diff --git a/server/schedulers/shuffle_region_config.go b/server/schedulers/shuffle_region_config.go
index 4063a8848bd..bed9e32b65c 100644
--- a/server/schedulers/shuffle_region_config.go
+++ b/server/schedulers/shuffle_region_config.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,11 +18,11 @@ import (
 	"sync"
 
 	"github.com/gorilla/mux"
-	"github.com/pingcap/pd/v4/pkg/apiutil"
-	"github.com/pingcap/pd/v4/pkg/slice"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
+	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/pkg/slice"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/placement"
 	"github.com/unrolled/render"
 )
 
diff --git a/server/schedulers/utils.go b/server/schedulers/utils.go
index c4503189cfc..a14403eb23e 100644
--- a/server/schedulers/utils.go
+++ b/server/schedulers/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,15 +17,15 @@ import (
 	"math"
 	"net/url"
 	"strconv"
-	"time"
 
 	"github.com/montanaflynn/stats"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/statistics"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/statistics"
 	"go.uber.org/zap"
 )
 
@@ -45,27 +45,6 @@ var (
 	ErrScheduleConfigNotExist = errors.New("the config does not exist")
 )
 
-func minUint64(a, b uint64) uint64 {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-func maxUint64(a, b uint64) uint64 {
-	if a > b {
-		return a
-	}
-	return b
-}
-
-func minDuration(a, b time.Duration) time.Duration {
-	if a < b {
-		return a
-	}
-	return b
-}
-
 func shouldBalance(cluster opt.Cluster, source, target *core.StoreInfo, region *core.RegionInfo, kind core.ScheduleKind, opInfluence operator.OpInfluence, scheduleName string) bool {
 	// The reason we use max(regionSize, averageRegionSize) to check is:
 	// 1. prevent moving small regions between stores with close scores, leading to unnecessary balance.
@@ -144,7 +123,7 @@ func adjustBalanceLimit(cluster opt.Cluster, kind core.ResourceKind) uint64 {
 		}
 	}
 	limit, _ := stats.StandardDeviation(counts)
-	return maxUint64(1, uint64(limit))
+	return typeutil.MaxUint64(1, uint64(limit))
 }
 
 func getKeyRanges(args []string) ([]core.KeyRange, error) {
diff --git a/server/server.go b/server/server.go
index efa9c5e2b0f..7298e737851 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -31,29 +31,30 @@ import (
 	"github.com/coreos/go-semver/semver"
 	"github.com/golang/protobuf/proto"
 	"github.com/gorilla/mux"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/diagnosticspb"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/errs"
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pingcap/pd/v4/pkg/grpcutil"
-	"github.com/pingcap/pd/v4/pkg/logutil"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server/cluster"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/id"
-	"github.com/pingcap/pd/v4/server/kv"
-	"github.com/pingcap/pd/v4/server/member"
-	syncer "github.com/pingcap/pd/v4/server/region_syncer"
-	"github.com/pingcap/pd/v4/server/schedule"
-	"github.com/pingcap/pd/v4/server/schedule/opt"
-	"github.com/pingcap/pd/v4/server/tso"
-	"github.com/pingcap/pd/v4/server/versioninfo"
 	"github.com/pingcap/sysutil"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/pkg/grpcutil"
+	"github.com/tikv/pd/pkg/logutil"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/cluster"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/election"
+	"github.com/tikv/pd/server/id"
+	"github.com/tikv/pd/server/kv"
+	"github.com/tikv/pd/server/member"
+	syncer "github.com/tikv/pd/server/region_syncer"
+	"github.com/tikv/pd/server/schedule"
+	"github.com/tikv/pd/server/schedule/opt"
+	"github.com/tikv/pd/server/tso"
+	"github.com/tikv/pd/server/versioninfo"
 	"github.com/urfave/negroni"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/embed"
@@ -100,10 +101,7 @@ type Server struct {
 	serverLoopCancel func()
 	serverLoopWg     sync.WaitGroup
 
-	// leader lease
-	lease   *member.LeaderLease
-	leaseMu sync.RWMutex
-
+	// for PD leader election.
 	member *member.Member
 	// etcd client
 	client *clientv3.Client
@@ -122,7 +120,7 @@ type Server struct {
 	// for baiscCluster operation.
 	basicCluster *core.BasicCluster
 	// for tso.
-	tso *tso.TimestampOracle
+	tsoAllocator tso.Allocator
 	// for raft cluster
 	cluster *cluster.RaftCluster
 	// For async region heartbeat.
@@ -351,10 +349,9 @@ func (s *Server) startServer(ctx context.Context) error {
 	s.member.SetMemberBinaryVersion(s.member.ID(), versioninfo.PDReleaseVersion)
 	s.member.SetMemberGitHash(s.member.ID(), versioninfo.PDGitHash)
 	s.idAllocator = id.NewAllocatorImpl(s.client, s.rootPath, s.member.MemberValue())
-	s.tso = tso.NewTimestampOracle(
-		s.client,
+	s.tsoAllocator = tso.NewGlobalTSOAllocator(
+		s.member.Leadership,
 		s.rootPath,
-		s.member.MemberValue(),
 		s.cfg.TsoSaveInterval.Duration,
 		func() time.Duration { return s.persistOptions.GetMaxResetTSGap() },
 	)
@@ -423,7 +420,7 @@ func (s *Server) Close() {
 		s.hbStreams.Close()
 	}
 	if err := s.storage.Close(); err != nil {
-		log.Error("close storage meet error", zap.Error(errs.ErrStorageClose.FastGenByArgs()), zap.NamedError("cause", err))
+		log.Error("close storage meet error", errs.ZapError(errs.ErrStorageClose, err))
 	}
 
 	// Run callbacks
@@ -442,7 +439,7 @@ func (s *Server) IsClosed() bool {
 // Run runs the pd server.
 func (s *Server) Run() error {
 	go StartMonitor(s.ctx, time.Now, func() {
-		log.Error("system time jumps backward", zap.Error(errs.ErrOtherSystemTime.FastGenByArgs()))
+		log.Error("system time jumps backward", errs.ZapError(errs.ErrSystemTime))
 		timeJumpBackCounter.Inc()
 	})
 	if err := s.startEtcd(s.ctx); err != nil {
@@ -635,7 +632,12 @@ func (s *Server) GetHTTPClient() *http.Client {
 	return s.httpClient
 }
 
-// GetLeader returns leader of etcd.
+// GetLeadership returns the member's leadership
+func (s *Server) GetLeadership() *election.Leadership {
+	return s.member.Leadership
+}
+
+// GetLeader returns the leader of PD cluster(i.e the PD leader).
 func (s *Server) GetLeader() *pdpb.Member {
 	return s.member.GetLeader()
 }
@@ -645,20 +647,6 @@ func (s *Server) GetMember() *member.Member {
 	return s.member
 }
 
-// GetLease returns the lease of member and only leader server's lease is not nil.
-func (s *Server) GetLease() *member.LeaderLease {
-	s.leaseMu.RLock()
-	defer s.leaseMu.RUnlock()
-	return s.lease
-}
-
-// SetLease changes the lease.
-func (s *Server) SetLease(lease *member.LeaderLease) {
-	s.leaseMu.Lock()
-	defer s.leaseMu.Unlock()
-	s.lease = lease
-}
-
 // GetStorage returns the backend storage of server.
 func (s *Server) GetStorage() *core.Storage {
 	return s.storage
@@ -730,7 +718,7 @@ func (s *Server) GetConfig() *config.Config {
 			log.Error("failed to decode scheduler config",
 				zap.String("config", configs[i]),
 				zap.String("scheduler", sche),
-				zap.Error(errs.ErrDecodeConfig.FastGenByArgs()), zap.NamedError("cause", err))
+				errs.ZapError(errs.ErrDecodeConfig, err))
 			continue
 		}
 		payload[sche] = config
@@ -762,7 +750,7 @@ func (s *Server) SetScheduleConfig(cfg config.ScheduleConfig) error {
 		log.Error("failed to update schedule config",
 			zap.Reflect("new", cfg),
 			zap.Reflect("old", old),
-			zap.Error(errs.ErrSavePersistOptions.FastGenByArgs()), zap.NamedError("cause", err))
+			errs.ZapError(errs.ErrSavePersistOptions, err))
 		return err
 	}
 	log.Info("schedule config is updated", zap.Reflect("new", cfg), zap.Reflect("old", old))
@@ -808,7 +796,7 @@ func (s *Server) SetReplicationConfig(cfg config.ReplicationConfig) error {
 		log.Error("failed to update replication config",
 			zap.Reflect("new", cfg),
 			zap.Reflect("old", old),
-			zap.Error(errs.ErrSavePersistOptions.FastGenByArgs()), zap.NamedError("cause", err))
+			errs.ZapError(errs.ErrSavePersistOptions, err))
 		return err
 	}
 	log.Info("replication config is updated", zap.Reflect("new", cfg), zap.Reflect("old", old))
@@ -846,7 +834,7 @@ func (s *Server) SetPDServerConfig(cfg config.PDServerConfig) error {
 		log.Error("failed to update PDServer config",
 			zap.Reflect("new", cfg),
 			zap.Reflect("old", old),
-			zap.Error(errs.ErrSavePersistOptions.FastGenByArgs()), zap.NamedError("cause", err))
+			errs.ZapError(errs.ErrSavePersistOptions, err))
 		return err
 	}
 	log.Info("PD server config is updated", zap.Reflect("new", cfg), zap.Reflect("old", old))
@@ -862,7 +850,7 @@ func (s *Server) SetLabelPropertyConfig(cfg config.LabelPropertyConfig) error {
 		log.Error("failed to update label property config",
 			zap.Reflect("new", cfg),
 			zap.Reflect("old", &old),
-			zap.Error(errs.ErrSavePersistOptions.FastGenByArgs()), zap.NamedError("cause", err))
+			errs.ZapError(errs.ErrSavePersistOptions, err))
 		return err
 	}
 	log.Info("label property config is updated", zap.Reflect("new", cfg), zap.Reflect("old", old))
@@ -880,7 +868,7 @@ func (s *Server) SetLabelProperty(typ, labelKey, labelValue string) error {
 			zap.String("labelKey", labelKey),
 			zap.String("labelValue", labelValue),
 			zap.Reflect("config", s.persistOptions.GetLabelPropertyConfig()),
-			zap.Error(errs.ErrSavePersistOptions.FastGenByArgs()), zap.NamedError("cause", err))
+			errs.ZapError(errs.ErrSavePersistOptions, err))
 		return err
 	}
 
@@ -899,7 +887,7 @@ func (s *Server) DeleteLabelProperty(typ, labelKey, labelValue string) error {
 			zap.String("labelKey", labelKey),
 			zap.String("labelValue", labelValue),
 			zap.Reflect("config", s.persistOptions.GetLabelPropertyConfig()),
-			zap.Error(errs.ErrSavePersistOptions.FastGenByArgs()), zap.NamedError("cause", err))
+			errs.ZapError(errs.ErrSavePersistOptions, err))
 		return err
 	}
 
@@ -914,7 +902,7 @@ func (s *Server) GetLabelProperty() config.LabelPropertyConfig {
 
 // SetClusterVersion sets the version of cluster.
 func (s *Server) SetClusterVersion(v string) error {
-	version, err := cluster.ParseVersion(v)
+	version, err := versioninfo.ParseVersion(v)
 	if err != nil {
 		return err
 	}
@@ -926,7 +914,7 @@ func (s *Server) SetClusterVersion(v string) error {
 		log.Error("failed to update cluster version",
 			zap.String("old-version", old.String()),
 			zap.String("new-version", v),
-			zap.Error(errs.ErrSavePersistOptions.FastGenByArgs()), zap.NamedError("cause", err))
+			errs.ZapError(errs.ErrSavePersistOptions, err))
 		return err
 	}
 	log.Info("cluster version is updated", zap.String("new-version", v))
@@ -1033,7 +1021,7 @@ func (s *Server) SetReplicationModeConfig(cfg config.ReplicationModeConfig) erro
 		log.Error("failed to update replication mode config",
 			zap.Reflect("new", cfg),
 			zap.Reflect("old", &old),
-			zap.Error(errs.ErrSavePersistOptions.FastGenByArgs()), zap.NamedError("cause", err))
+			errs.ZapError(errs.ErrSavePersistOptions, err))
 		return err
 	}
 	log.Info("replication mode config is updated", zap.Reflect("new", cfg), zap.Reflect("old", old))
@@ -1047,11 +1035,11 @@ func (s *Server) SetReplicationModeConfig(cfg config.ReplicationModeConfig) erro
 			// NOTE: since we can't put the 2 storage mutations in a batch, it
 			// is possible that memory and persistent data become different
 			// (when below revert fail). They will become the same after PD is
-			// restart or leader is changed.
+			// restart or PD leader is changed.
 			s.persistOptions.SetReplicationModeConfig(old)
 			revertErr := s.persistOptions.Persist(s.storage)
 			if revertErr != nil {
-				log.Error("failed to revert replication mode persistent config", zap.Error(errs.ErrSavePersistOptions.FastGenByArgs()), zap.NamedError("cause", revertErr))
+				log.Error("failed to revert replication mode persistent config", errs.ZapError(errs.ErrSavePersistOptions, err))
 			}
 		}
 		return err
@@ -1066,7 +1054,7 @@ func (s *Server) leaderLoop() {
 
 	for {
 		if s.IsClosed() {
-			log.Info("server is closed, return leader loop")
+			log.Info("server is closed, return pd leader loop")
 			return
 		}
 
@@ -1077,22 +1065,22 @@ func (s *Server) leaderLoop() {
 		if leader != nil {
 			err := s.reloadConfigFromKV()
 			if err != nil {
-				log.Error("reload config failed", zap.Error(errs.ErrLoadPersistOptions.FastGenByArgs()), zap.NamedError("cause", err))
+				log.Error("reload config failed", errs.ZapError(errs.ErrLoadPersistOptions, err))
 				continue
 			}
 			syncer := s.cluster.GetRegionSyncer()
 			if s.persistOptions.IsUseRegionStorage() {
 				syncer.StartSyncWithLeader(leader.GetClientUrls()[0])
 			}
-			log.Info("start watch leader", zap.Stringer("leader", leader))
+			log.Info("start watch pd leader", zap.Stringer("pd-leader", leader))
 			s.member.WatchLeader(s.serverLoopCtx, leader, rev)
 			syncer.StopSyncWithLeader()
-			log.Info("leader changed, try to campaign leader")
+			log.Info("pd leader changed, try to re-campaign a pd leader")
 		}
 
 		etcdLeader := s.member.GetEtcdLeader()
 		if etcdLeader != s.member.ID() {
-			log.Info("skip campaign leader and check later",
+			log.Info("skip campaigning of pd leader and check later",
 				zap.String("server-name", s.Name()),
 				zap.Uint64("etcd-leader-id", etcdLeader))
 			time.Sleep(200 * time.Millisecond)
@@ -1103,43 +1091,40 @@ func (s *Server) leaderLoop() {
 }
 
 func (s *Server) campaignLeader() {
-	log.Info("start to campaign leader", zap.String("campaign-leader-name", s.Name()))
-
-	lease := member.NewLeaderLease(s.client)
-	defer lease.Close()
-	if err := s.member.CampaignLeader(lease, s.cfg.LeaderLease); err != nil {
-		log.Error("campaign leader meet error", zap.Error(err))
+	log.Info("start to campaign pd leader",
+		zap.String("campaign-pd-leader-name", s.Name()),
+		zap.String("purpose", s.member.Leadership.Purpose))
+	if err := s.member.Leadership.Campaign(s.cfg.LeaderLease, s.member.GetLeaderPath(), s.member.MemberValue()); err != nil {
+		log.Error("campaign pd leader meet error", errs.ZapError(errs.ErrCampaignLeader, err))
 		return
 	}
 
-	// Start keepalive and enable TSO service.
-	// TSO service is strictly enabled/disabled by leader lease for 2 reasons:
+	// Start keepalive the leadership and enable TSO service.
+	// TSO service is strictly enabled/disabled by PD leader lease for 2 reasons:
 	//   1. lease based approach is not affected by thread pause, slow runtime schedule, etc.
 	//   2. load region could be slow. Based on lease we can recover TSO service faster.
 
 	ctx, cancel := context.WithCancel(s.serverLoopCtx)
 	defer cancel()
-	go lease.KeepAlive(ctx)
-	s.SetLease(lease)
-	defer s.SetLease(nil)
-	log.Info("campaign leader ok", zap.String("campaign-leader-name", s.Name()))
-
-	log.Debug("sync timestamp for tso")
-	if err := s.tso.SyncTimestamp(lease); err != nil {
-		log.Error("failed to sync timestamp", zap.Error(errs.ErrSyncTso.FastGenByArgs()), zap.NamedError("cause", err))
+	defer s.member.Leadership.Reset()
+	// maintain the leadership
+	go s.member.Leadership.Keep(ctx)
+	log.Info("campaign pd leader ok", zap.String("campaign-pd-leader-name", s.Name()))
+
+	log.Info("initialize the global TSO allocator")
+	if err := s.tsoAllocator.Initialize(); err != nil {
+		log.Error("failed to initialize the global TSO allocator", errs.ZapError(errs.ErrCreateTSOStream, err))
 		return
 	}
-	defer s.tso.ResetTimestamp()
+	defer s.tsoAllocator.Reset()
 
-	err := s.reloadConfigFromKV()
-	if err != nil {
-		log.Error("failed to reload configuration", zap.Error(errs.ErrLoadPersistOptions.FastGenByArgs()), zap.NamedError("cause", err))
+	if err := s.reloadConfigFromKV(); err != nil {
+		log.Error("failed to reload configuration", errs.ZapError(errs.ErrLoadPersistOptions, err))
 		return
 	}
 	// Try to create raft cluster.
-	err = s.createRaftCluster()
-	if err != nil {
-		log.Error("failed to create raft cluster", zap.Error(err), zap.NamedError("cause", err))
+	if err := s.createRaftCluster(); err != nil {
+		log.Error("failed to create raft cluster", errs.ZapError(errs.ErrCreateCluster, err))
 		return
 	}
 	defer s.stopRaftCluster()
@@ -1148,7 +1133,7 @@ func (s *Server) campaignLeader() {
 	defer s.member.DisableLeader()
 
 	CheckPDVersion(s.persistOptions)
-	log.Info("PD cluster leader is ready to serve", zap.String("leader-name", s.Name()))
+	log.Info("PD cluster leader is ready to serve", zap.String("pd-leader-name", s.Name()))
 
 	tsTicker := time.NewTicker(tso.UpdateTimestampStep)
 	defer tsTicker.Stop()
@@ -1158,18 +1143,18 @@ func (s *Server) campaignLeader() {
 	for {
 		select {
 		case <-leaderTicker.C:
-			if lease.IsExpired() {
-				log.Info("lease expired, leader step down")
+			if !s.member.Leadership.Check() {
+				log.Info("leadership is invalid because lease has expired, pd leader will step down")
 				return
 			}
 			etcdLeader := s.member.GetEtcdLeader()
 			if etcdLeader != s.member.ID() {
-				log.Info("etcd leader changed, resigns leadership", zap.String("old-leader-name", s.Name()))
+				log.Info("etcd leader changed, resigns pd leadership", zap.String("old-pd-leader-name", s.Name()))
 				return
 			}
 		case <-tsTicker.C:
-			if err = s.tso.UpdateTimestamp(); err != nil {
-				log.Error("failed to update timestamp", zap.Error(errs.ErrUpdateTso.FastGenByArgs()), zap.NamedError("cause", err))
+			if err := s.tsoAllocator.UpdateTSO(); err != nil {
+				log.Error("failed to update timestamp", errs.ZapError(errs.ErrUpdateTso, err))
 				return
 			}
 		case <-ctx.Done():
diff --git a/server/server_test.go b/server/server_test.go
index f3ce952883d..47f847a81a0 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@ import (
 	"testing"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server/config"
+	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server/config"
 	"go.etcd.io/etcd/embed"
 	"go.etcd.io/etcd/pkg/types"
 	"go.uber.org/goleak"
diff --git a/server/statistics/avg_over_time.go b/server/statistics/avg_over_time.go
index ead36715aa7..cb58e445a49 100644
--- a/server/statistics/avg_over_time.go
+++ b/server/statistics/avg_over_time.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/statistics/avg_over_time_test.go b/server/statistics/avg_over_time_test.go
index cbf436b1c12..2f164dd4eb4 100644
--- a/server/statistics/avg_over_time_test.go
+++ b/server/statistics/avg_over_time_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/statistics/flowkind.go b/server/statistics/flowkind.go
index 7be44d5cc90..75923e626df 100644
--- a/server/statistics/flowkind.go
+++ b/server/statistics/flowkind.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/statistics/hot_cache.go b/server/statistics/hot_cache.go
index b4625ca37d1..1e4a0fffe36 100644
--- a/server/statistics/hot_cache.go
+++ b/server/statistics/hot_cache.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ package statistics
 import (
 	"math/rand"
 
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server/core"
 )
 
 // Denoising is an option to calculate flow base on the real heartbeats. Should
diff --git a/server/statistics/hot_peer.go b/server/statistics/hot_peer.go
index fa3f2db52be..46b36d7b7af 100644
--- a/server/statistics/hot_peer.go
+++ b/server/statistics/hot_peer.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/statistics/hot_peer_cache.go b/server/statistics/hot_peer_cache.go
index 38e4b4c5a92..38f0485048f 100644
--- a/server/statistics/hot_peer_cache.go
+++ b/server/statistics/hot_peer_cache.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ import (
 	"time"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server/core"
 )
 
 const (
diff --git a/server/statistics/hot_peer_cache_test.go b/server/statistics/hot_peer_cache_test.go
index 45fc384fbdf..64e066302ce 100644
--- a/server/statistics/hot_peer_cache_test.go
+++ b/server/statistics/hot_peer_cache_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server/core"
 )
 
 var _ = Suite(&testHotPeerCache{})
diff --git a/server/statistics/hot_regions_stat.go b/server/statistics/hot_regions_stat.go
index 74a54837819..a466c102562 100644
--- a/server/statistics/hot_regions_stat.go
+++ b/server/statistics/hot_regions_stat.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/statistics/metrics.go b/server/statistics/metrics.go
index 3f9bf0970cc..f1cc01005ae 100644
--- a/server/statistics/metrics.go
+++ b/server/statistics/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/statistics/region.go b/server/statistics/region.go
index 45074cf7714..e9d2bfafb16 100644
--- a/server/statistics/region.go
+++ b/server/statistics/region.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 package statistics
 
 import (
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server/core"
 )
 
 const (
diff --git a/server/statistics/region_collection.go b/server/statistics/region_collection.go
index b9be59ac721..62b97280b0d 100644
--- a/server/statistics/region_collection.go
+++ b/server/statistics/region_collection.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 package statistics
 
 import (
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server/core"
 )
 
 // RegionStatisticType represents the type of the region's status.
diff --git a/server/statistics/region_collection_test.go b/server/statistics/region_collection_test.go
index 7ac0b296e0a..2e5a76ec160 100644
--- a/server/statistics/region_collection_test.go
+++ b/server/statistics/region_collection_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/server/core"
 )
 
 var _ = Suite(&testRegionStatisticsSuite{})
@@ -31,7 +31,7 @@ func (t *testRegionStatisticsSuite) TestRegionStatistics(c *C) {
 		{Id: 5, StoreId: 1},
 		{Id: 6, StoreId: 2},
 		{Id: 4, StoreId: 3},
-		{Id: 8, StoreId: 7, IsLearner: true},
+		{Id: 8, StoreId: 7, Role: metapb.PeerRole_Learner},
 	}
 
 	metaStores := []*metapb.Store{
diff --git a/server/statistics/region_stat_informer.go b/server/statistics/region_stat_informer.go
index 057cb1c1ae9..c2039dde212 100644
--- a/server/statistics/region_stat_informer.go
+++ b/server/statistics/region_stat_informer.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
 
 package statistics
 
-import "github.com/pingcap/pd/v4/server/core"
+import "github.com/tikv/pd/server/core"
 
 // RegionStatInformer provides access to a shared informer of statistics.
 type RegionStatInformer interface {
diff --git a/server/statistics/schedule_options.go b/server/statistics/schedule_options.go
index a1cff42ceb5..a0977633aeb 100644
--- a/server/statistics/schedule_options.go
+++ b/server/statistics/schedule_options.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@ package statistics
 import (
 	"time"
 
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/schedule/storelimit"
 )
 
 // ScheduleOptions is an interface to access configurations.
diff --git a/server/statistics/store.go b/server/statistics/store.go
index 3bbc27a5239..c5331f85979 100644
--- a/server/statistics/store.go
+++ b/server/statistics/store.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server/core"
 	"go.uber.org/zap"
 )
 
@@ -290,6 +290,22 @@ func (s *StoresStats) GetStoresKeysReadStat() map[uint64]float64 {
 	return res
 }
 
+func (s *StoresStats) storeIsUnhealthy(cluster core.StoreSetInformer, storeID uint64) bool {
+	store := cluster.GetStore(storeID)
+	return store.IsTombstone() || store.IsUnhealth()
+}
+
+// FilterUnhealthyStore filter unhealthy store
+func (s *StoresStats) FilterUnhealthyStore(cluster core.StoreSetInformer) {
+	s.Lock()
+	defer s.Unlock()
+	for storeID := range s.rollingStoresStats {
+		if s.storeIsUnhealthy(cluster, storeID) {
+			delete(s.rollingStoresStats, storeID)
+		}
+	}
+}
+
 // RollingStoreStats are multiple sets of recent historical records with specified windows size.
 type RollingStoreStats struct {
 	sync.RWMutex
diff --git a/server/statistics/store_collection.go b/server/statistics/store_collection.go
index 7018a459130..5292bbbe07f 100644
--- a/server/statistics/store_collection.go
+++ b/server/statistics/store_collection.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ import (
 	"strconv"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/server/core"
 )
 
 const (
@@ -104,6 +104,10 @@ func (s *storeStatistics) Observe(store *core.StoreInfo, stats *StoresStats) {
 
 	// Store flows.
 	storeFlowStats := stats.GetRollingStoreStats(store.GetID())
+	if storeFlowStats == nil {
+		return
+	}
+
 	storeWriteRateByte, storeReadRateByte := storeFlowStats.GetBytesRate()
 	storeStatusGauge.WithLabelValues(storeAddress, id, "store_write_rate_bytes").Set(storeWriteRateByte)
 	storeStatusGauge.WithLabelValues(storeAddress, id, "store_read_rate_bytes").Set(storeReadRateByte)
diff --git a/server/statistics/store_collection_test.go b/server/statistics/store_collection_test.go
index 61bed15fd1e..6f7fcfd6eb3 100644
--- a/server/statistics/store_collection_test.go
+++ b/server/statistics/store_collection_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockoption"
-	"github.com/pingcap/pd/v4/server/core"
+	"github.com/tikv/pd/pkg/mock/mockoption"
+	"github.com/tikv/pd/server/core"
 )
 
 var _ = Suite(&testStoreStatisticsSuite{})
diff --git a/server/statistics/store_hot_peers_infos.go b/server/statistics/store_hot_peers_infos.go
index a2b933565f4..a75073c5e2a 100644
--- a/server/statistics/store_hot_peers_infos.go
+++ b/server/statistics/store_hot_peers_infos.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/statistics/store_stat_informer.go b/server/statistics/store_stat_informer.go
index 43e110ffd1b..4f0cd29ca63 100644
--- a/server/statistics/store_stat_informer.go
+++ b/server/statistics/store_stat_informer.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/statistics/topn.go b/server/statistics/topn.go
index 98d5c439ba4..08cd0e5611b 100644
--- a/server/statistics/topn.go
+++ b/server/statistics/topn.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/statistics/topn_test.go b/server/statistics/topn_test.go
index a5d865f6cbc..adb8744d039 100644
--- a/server/statistics/topn_test.go
+++ b/server/statistics/topn_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/statistics/util.go b/server/statistics/util.go
index c8fda0fc802..a34b87988ca 100644
--- a/server/statistics/util.go
+++ b/server/statistics/util.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/statistics/util_test.go b/server/statistics/util_test.go
index cd98bfa8dbf..6f48be033c4 100644
--- a/server/statistics/util_test.go
+++ b/server/statistics/util_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/systime_mon.go b/server/systime_mon.go
index db39fed2c56..ebfa7a0603b 100644
--- a/server/systime_mon.go
+++ b/server/systime_mon.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/systime_mon_test.go b/server/systime_mon_test.go
index 4bab0eddb08..e1e2f8ed63d 100644
--- a/server/systime_mon_test.go
+++ b/server/systime_mon_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/testutil.go b/server/testutil.go
index 80e52c11f39..eab0690488a 100644
--- a/server/testutil.go
+++ b/server/testutil.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,14 +23,14 @@ import (
 
 	"github.com/pingcap/check"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/tempurl"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server/config"
+	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/config"
 	"go.etcd.io/etcd/embed"
 
 	// Register schedulers
-	_ "github.com/pingcap/pd/v4/server/schedulers"
+	_ "github.com/tikv/pd/server/schedulers"
 )
 
 // CleanupFunc closes test pd server(s) and deletes any files left behind.
diff --git a/server/tso/global_allocator.go b/server/tso/global_allocator.go
new file mode 100755
index 00000000000..e03b5c40483
--- /dev/null
+++ b/server/tso/global_allocator.go
@@ -0,0 +1,147 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tso
+
+import (
+	"sync/atomic"
+	"time"
+
+	"github.com/pingcap/errors"
+	"github.com/pingcap/failpoint"
+	"github.com/pingcap/kvproto/pkg/pdpb"
+	"github.com/pingcap/log"
+	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/election"
+	"go.uber.org/zap"
+)
+
+// Allocator is a Timestamp Orcale allocator.
+type Allocator interface {
+	// Initialize is used to initialize a TSO allocator.
+	// It will synchronize TSO with etcd and initialize the
+	// memory for later allocation work.
+	Initialize() error
+	// UpdateTSO is used to update the TSO in memory and the time window in etcd.
+	UpdateTSO() error
+	// SetTSO sets the physical part with given tso. It's mainly used for BR restore
+	// and can not forcibly set the TSO smaller than now.
+	SetTSO(tso uint64) error
+	// GenerateTSO is used to generate a given number of TSOs.
+	// Make sure you have initialized the TSO allocator before calling.
+	GenerateTSO(count uint32) (pdpb.Timestamp, error)
+	// Reset is uesed to reset the TSO allocator.
+	Reset()
+}
+
+// GlobalTSOAllocator is the global single point TSO allocator.
+type GlobalTSOAllocator struct {
+	// leadership is used to check the current PD server's leadership
+	// to determine whether a tso request could be processed and
+	// it's stored as *election.Leadership
+	leadership      atomic.Value
+	timestampOracle *timestampOracle
+}
+
+// NewGlobalTSOAllocator creates a new global TSO allocator.
+func NewGlobalTSOAllocator(leadership *election.Leadership, rootPath string, saveInterval time.Duration, maxResetTSGap func() time.Duration) Allocator {
+	gta := &GlobalTSOAllocator{
+		timestampOracle: &timestampOracle{
+			client:        leadership.GetClient(),
+			rootPath:      rootPath,
+			saveInterval:  saveInterval,
+			maxResetTSGap: maxResetTSGap,
+		},
+	}
+	gta.setLeadership(leadership)
+	return gta
+}
+
+func (gta *GlobalTSOAllocator) getLeadership() *election.Leadership {
+	leadership := gta.leadership.Load()
+	if leadership == nil {
+		return nil
+	}
+	return leadership.(*election.Leadership)
+}
+
+func (gta *GlobalTSOAllocator) setLeadership(leadership *election.Leadership) {
+	gta.leadership.Store(leadership)
+}
+
+// Initialize will initialize the created global TSO allocator.
+func (gta *GlobalTSOAllocator) Initialize() error {
+	return gta.timestampOracle.SyncTimestamp(gta.getLeadership())
+}
+
+// UpdateTSO is used to update the TSO in memory and the time window in etcd.
+func (gta *GlobalTSOAllocator) UpdateTSO() error {
+	return gta.timestampOracle.UpdateTimestamp(gta.getLeadership())
+}
+
+// SetTSO sets the physical part with given tso.
+func (gta *GlobalTSOAllocator) SetTSO(tso uint64) error {
+	return gta.timestampOracle.ResetUserTimestamp(gta.getLeadership(), tso)
+}
+
+// GenerateTSO is used to generate a given number of TSOs.
+// Make sure you have initialized the TSO allocator before calling.
+func (gta *GlobalTSOAllocator) GenerateTSO(count uint32) (pdpb.Timestamp, error) {
+	var resp pdpb.Timestamp
+
+	if count == 0 {
+		return resp, errors.New("tso count should be positive")
+	}
+
+	maxRetryCount := 10
+	failpoint.Inject("skipRetryGetTS", func() {
+		maxRetryCount = 1
+	})
+
+	for i := 0; i < maxRetryCount; i++ {
+		current := (*atomicObject)(atomic.LoadPointer(&gta.timestampOracle.TSO))
+		if current == nil || current.physical == typeutil.ZeroTime {
+			// If it's leader, maybe SyncTimestamp hasn't completed yet
+			if gta.getLeadership().Check() {
+				log.Info("sync hasn't completed yet, wait for a while")
+				time.Sleep(200 * time.Millisecond)
+				continue
+			}
+			log.Error("invalid timestamp", zap.Any("timestamp", current), zap.Error(errs.ErrInvalidTimestamp.FastGenByArgs()))
+			return pdpb.Timestamp{}, errors.New("can not get timestamp, may be not leader")
+		}
+
+		resp.Physical = current.physical.UnixNano() / int64(time.Millisecond)
+		resp.Logical = atomic.AddInt64(&current.logical, int64(count))
+		if resp.Logical >= maxLogical {
+			log.Error("logical part outside of max logical interval, please check ntp time",
+				zap.Reflect("response", resp),
+				zap.Int("retry-count", i), zap.Error(errs.ErrLogicOverflow.FastGenByArgs()))
+			tsoCounter.WithLabelValues("logical_overflow").Inc()
+			time.Sleep(UpdateTimestampStep)
+			continue
+		}
+		// In case lease expired after the first check.
+		if !gta.getLeadership().Check() {
+			return pdpb.Timestamp{}, errors.New("alloc timestamp failed, lease expired")
+		}
+		return resp, nil
+	}
+	return resp, errors.New("can not get timestamp")
+}
+
+// Reset is uesed to reset the TSO allocator.
+func (gta *GlobalTSOAllocator) Reset() {
+	gta.timestampOracle.ResetTimestamp()
+}
diff --git a/server/tso/metrics.go b/server/tso/metrics.go
index bb7c33c6aa4..43cf6b74b76 100644
--- a/server/tso/metrics.go
+++ b/server/tso/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/server/tso/tso.go b/server/tso/tso.go
old mode 100644
new mode 100755
index bf2ca3f565f..c1c4d996e93
--- a/server/tso/tso.go
+++ b/server/tso/tso.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,69 +15,56 @@ package tso
 
 import (
 	"path"
-	"sync"
 	"sync/atomic"
 	"time"
 	"unsafe"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
-	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pingcap/pd/v4/pkg/tsoutil"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server/kv"
-	"github.com/pingcap/pd/v4/server/member"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/pkg/tsoutil"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/election"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
 )
 
 const (
 	// UpdateTimestampStep is used to update timestamp.
-	UpdateTimestampStep  = 50 * time.Millisecond
+	UpdateTimestampStep = 50 * time.Millisecond
+	// updateTimestampGuard is the min timestamp interval.
 	updateTimestampGuard = time.Millisecond
-	maxLogical           = int64(1 << 18)
+	// maxLogical is the max upper limit for logical time.
+	// When a TSO's logical time reachs this limit,
+	// the physical time will be forced to increase.
+	maxLogical = int64(1 << 18)
 )
 
-// TimestampOracle is used to maintain the logic of tso.
-type TimestampOracle struct {
-	// For tso, set after pd becomes leader.
-	ts            unsafe.Pointer
-	lastSavedTime atomic.Value
-
-	mu    sync.RWMutex
-	lease *member.LeaderLease
-
-	rootPath      string
-	member        string
-	client        *clientv3.Client
-	saveInterval  time.Duration
-	maxResetTSGap func() time.Duration
-}
-
-// NewTimestampOracle creates a new TimestampOracle.
-// TODO: remove saveInterval
-func NewTimestampOracle(client *clientv3.Client, rootPath string, member string, saveInterval time.Duration, maxResetTSGap func() time.Duration) *TimestampOracle {
-	return &TimestampOracle{
-		rootPath:      rootPath,
-		client:        client,
-		saveInterval:  saveInterval,
-		maxResetTSGap: maxResetTSGap,
-		member:        member,
-	}
-}
-
+// atomicObject is used to store the current TSO in memory.
 type atomicObject struct {
 	physical time.Time
 	logical  int64
 }
 
-func (t *TimestampOracle) getTimestampPath() string {
+// timestampOracle is used to maintain the logic of tso.
+type timestampOracle struct {
+	client   *clientv3.Client
+	rootPath string
+	// TODO: remove saveInterval
+	saveInterval  time.Duration
+	maxResetTSGap func() time.Duration
+	// For tso, set after the PD becomes a leader.
+	TSO           unsafe.Pointer
+	lastSavedTime atomic.Value
+}
+
+func (t *timestampOracle) getTimestampPath() string {
 	return path.Join(t.rootPath, "timestamp")
 }
 
-func (t *TimestampOracle) loadTimestamp() (time.Time, error) {
+func (t *timestampOracle) loadTimestamp() (time.Time, error) {
 	data, err := etcdutil.GetValue(t.client, t.getTimestampPath())
 	if err != nil {
 		return typeutil.ZeroTime, err
@@ -88,27 +75,14 @@ func (t *TimestampOracle) loadTimestamp() (time.Time, error) {
 	return typeutil.ParseTimestamp(data)
 }
 
-func (t *TimestampOracle) checkLease() bool {
-	t.mu.RLock()
-	defer t.mu.RUnlock()
-	return t.lease != nil && !t.lease.IsExpired()
-}
-
-func (t *TimestampOracle) setLease(lease *member.LeaderLease) {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	t.lease = lease
-}
-
 // save timestamp, if lastTs is 0, we think the timestamp doesn't exist, so create it,
 // otherwise, update it.
-func (t *TimestampOracle) saveTimestamp(ts time.Time) error {
-	data := typeutil.Uint64ToBytes(uint64(ts.UnixNano()))
+func (t *timestampOracle) saveTimestamp(leadership *election.Leadership, ts time.Time) error {
 	key := t.getTimestampPath()
-
-	leaderPath := path.Join(t.rootPath, "leader")
-	txn := kv.NewSlowLogTxn(t.client).If(append([]clientv3.Cmp{}, clientv3.Compare(clientv3.Value(leaderPath), "=", t.member))...)
-	resp, err := txn.Then(clientv3.OpPut(key, string(data))).Commit()
+	data := typeutil.Uint64ToBytes(uint64(ts.UnixNano()))
+	resp, err := leadership.LeaderTxn().
+		Then(clientv3.OpPut(key, string(data))).
+		Commit()
 	if err != nil {
 		return errors.WithStack(err)
 	}
@@ -122,11 +96,9 @@ func (t *TimestampOracle) saveTimestamp(ts time.Time) error {
 }
 
 // SyncTimestamp is used to synchronize the timestamp.
-func (t *TimestampOracle) SyncTimestamp(lease *member.LeaderLease) error {
+func (t *timestampOracle) SyncTimestamp(leadership *election.Leadership) error {
 	tsoCounter.WithLabelValues("sync").Inc()
 
-	t.setLease(lease)
-
 	failpoint.Inject("delaySyncTimestamp", func() {
 		time.Sleep(time.Second)
 	})
@@ -144,12 +116,12 @@ func (t *TimestampOracle) SyncTimestamp(lease *member.LeaderLease) error {
 	// If the current system time minus the saved etcd timestamp is less than `updateTimestampGuard`,
 	// the timestamp allocation will start from the saved etcd timestamp temporarily.
 	if typeutil.SubTimeByWallClock(next, last) < updateTimestampGuard {
-		log.Error("system time may be incorrect", zap.Time("last", last), zap.Time("next", next))
+		log.Error("system time may be incorrect", zap.Time("last", last), zap.Time("next", next), zap.Error(errs.ErrIncorrectSystemTime.FastGenByArgs()))
 		next = last.Add(updateTimestampGuard)
 	}
 
 	save := next.Add(t.saveInterval)
-	if err = t.saveTimestamp(save); err != nil {
+	if err = t.saveTimestamp(leadership, save); err != nil {
 		tsoCounter.WithLabelValues("err_save_sync_ts").Inc()
 		return err
 	}
@@ -160,20 +132,20 @@ func (t *TimestampOracle) SyncTimestamp(lease *member.LeaderLease) error {
 	current := &atomicObject{
 		physical: next,
 	}
-	atomic.StorePointer(&t.ts, unsafe.Pointer(current))
+	atomic.StorePointer(&t.TSO, unsafe.Pointer(current))
 
 	return nil
 }
 
 // ResetUserTimestamp update the physical part with specified tso.
-func (t *TimestampOracle) ResetUserTimestamp(tso uint64) error {
-	if !t.checkLease() {
+func (t *timestampOracle) ResetUserTimestamp(leadership *election.Leadership, tso uint64) error {
+	if !leadership.Check() {
 		tsoCounter.WithLabelValues("err_lease_reset_ts").Inc()
 		return errors.New("Setup timestamp failed, lease expired")
 	}
 	physical, _ := tsoutil.ParseTS(tso)
 	next := physical.Add(time.Millisecond)
-	prev := (*atomicObject)(atomic.LoadPointer(&t.ts))
+	prev := (*atomicObject)(atomic.LoadPointer(&t.TSO))
 
 	// do not update
 	if typeutil.SubTimeByWallClock(next, prev.physical) <= 3*updateTimestampGuard {
@@ -187,31 +159,31 @@ func (t *TimestampOracle) ResetUserTimestamp(tso uint64) error {
 	}
 
 	save := next.Add(t.saveInterval)
-	if err := t.saveTimestamp(save); err != nil {
+	if err := t.saveTimestamp(leadership, save); err != nil {
 		tsoCounter.WithLabelValues("err_save_reset_ts").Inc()
 		return err
 	}
 	update := &atomicObject{
 		physical: next,
 	}
-	atomic.CompareAndSwapPointer(&t.ts, unsafe.Pointer(prev), unsafe.Pointer(update))
+	atomic.CompareAndSwapPointer(&t.TSO, unsafe.Pointer(prev), unsafe.Pointer(update))
 	tsoCounter.WithLabelValues("reset_tso_ok").Inc()
 	return nil
 }
 
 // UpdateTimestamp is used to update the timestamp.
 // This function will do two things:
-// 1. When the logical time is going to be used up, the current physical time needs to increase.
-// 2. If the time window is not enough, which means the saved etcd time minus the next physical time
-//    is less than or equal to `updateTimestampGuard`, it will need to be updated and save the
-//    next physical time plus `TsoSaveInterval` into etcd.
+// 1. When the logical time is going to be used up, increase the current physical time.
+// 2. When the time window is not big enough, which means the saved etcd time minus the next physical time
+//    will be less than or equal to `updateTimestampGuard`, then the time window needs to be updated and
+//    we also need to save the next physical time plus `TsoSaveInterval` into etcd.
 //
 // Here is some constraints that this function must satisfy:
-// 1. The physical time is monotonically increasing.
-// 2. The saved time is monotonically increasing.
+// 1. The saved time is monotonically increasing.
+// 2. The physical time is monotonically increasing.
 // 3. The physical time is always less than the saved timestamp.
-func (t *TimestampOracle) UpdateTimestamp() error {
-	prev := (*atomicObject)(atomic.LoadPointer(&t.ts))
+func (t *timestampOracle) UpdateTimestamp(leadership *election.Leadership) error {
+	prev := (*atomicObject)(atomic.LoadPointer(&t.TSO))
 	now := time.Now()
 
 	failpoint.Inject("fallBackUpdate", func() {
@@ -250,7 +222,7 @@ func (t *TimestampOracle) UpdateTimestamp() error {
 	// The time window needs to be updated and saved to etcd.
 	if typeutil.SubTimeByWallClock(t.lastSavedTime.Load().(time.Time), next) <= updateTimestampGuard {
 		save := next.Add(t.saveInterval)
-		if err := t.saveTimestamp(save); err != nil {
+		if err := t.saveTimestamp(leadership, save); err != nil {
 			tsoCounter.WithLabelValues("err_save_update_ts").Inc()
 			return err
 		}
@@ -261,63 +233,16 @@ func (t *TimestampOracle) UpdateTimestamp() error {
 		logical:  0,
 	}
 
-	atomic.StorePointer(&t.ts, unsafe.Pointer(current))
+	atomic.StorePointer(&t.TSO, unsafe.Pointer(current))
 	tsoGauge.WithLabelValues("tso").Set(float64(next.Unix()))
 
 	return nil
 }
 
 // ResetTimestamp is used to reset the timestamp.
-func (t *TimestampOracle) ResetTimestamp() {
+func (t *timestampOracle) ResetTimestamp() {
 	zero := &atomicObject{
 		physical: typeutil.ZeroTime,
 	}
-	atomic.StorePointer(&t.ts, unsafe.Pointer(zero))
-	t.setLease(nil)
-}
-
-var maxRetryCount = 10
-
-// GetRespTS is used to get a timestamp.
-func (t *TimestampOracle) GetRespTS(count uint32) (pdpb.Timestamp, error) {
-	var resp pdpb.Timestamp
-
-	if count == 0 {
-		return resp, errors.New("tso count should be positive")
-	}
-
-	failpoint.Inject("skipRetryGetTS", func() {
-		maxRetryCount = 1
-	})
-
-	for i := 0; i < maxRetryCount; i++ {
-		current := (*atomicObject)(atomic.LoadPointer(&t.ts))
-		if current == nil || current.physical == typeutil.ZeroTime {
-			// If it's leader, maybe SyncTimestamp hasn't completed yet
-			if t.checkLease() {
-				log.Info("sync hasn't completed yet, wait for a while")
-				time.Sleep(200 * time.Millisecond)
-				continue
-			}
-			log.Error("invalid timestamp", zap.Any("timestamp", current))
-			return pdpb.Timestamp{}, errors.New("can not get timestamp, may be not leader")
-		}
-
-		resp.Physical = current.physical.UnixNano() / int64(time.Millisecond)
-		resp.Logical = atomic.AddInt64(&current.logical, int64(count))
-		if resp.Logical >= maxLogical {
-			log.Error("logical part outside of max logical interval, please check ntp time",
-				zap.Reflect("response", resp),
-				zap.Int("retry-count", i))
-			tsoCounter.WithLabelValues("logical_overflow").Inc()
-			time.Sleep(UpdateTimestampStep)
-			continue
-		}
-		// In case lease expired after the first check.
-		if !t.checkLease() {
-			return pdpb.Timestamp{}, errors.New("alloc timestamp failed, lease expired")
-		}
-		return resp, nil
-	}
-	return resp, errors.New("can not get timestamp")
+	atomic.StorePointer(&t.TSO, unsafe.Pointer(zero))
 }
diff --git a/server/util.go b/server/util.go
index 79a0799ded6..fb283542e45 100644
--- a/server/util.go
+++ b/server/util.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,14 +20,13 @@ import (
 	"path"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server/cluster"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/versioninfo"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/versioninfo"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
 )
@@ -69,9 +68,9 @@ func PrintConfigCheckMsg(cfg *config.Config) {
 
 // CheckPDVersion checks if PD needs to be upgraded.
 func CheckPDVersion(opt *config.PersistOptions) {
-	pdVersion := *cluster.MinSupportedVersion(cluster.Base)
+	pdVersion := versioninfo.MinSupportedVersion(versioninfo.Base)
 	if versioninfo.PDReleaseVersion != "None" {
-		pdVersion = *cluster.MustParseVersion(versioninfo.PDReleaseVersion)
+		pdVersion = versioninfo.MustParseVersion(versioninfo.PDReleaseVersion)
 	}
 	clusterVersion := *opt.GetClusterVersion()
 	log.Info("load cluster version", zap.Stringer("cluster-version", clusterVersion))
diff --git a/server/cluster/version.go b/server/versioninfo/feature.go
similarity index 59%
rename from server/cluster/version.go
rename to server/versioninfo/feature.go
index 9ec745083a3..999d16b4bbc 100644
--- a/server/cluster/version.go
+++ b/server/versioninfo/feature.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,12 +11,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cluster
+package versioninfo
 
 import (
 	"github.com/coreos/go-semver/semver"
 	"github.com/pingcap/log"
-	"github.com/pkg/errors"
 	"go.uber.org/zap"
 )
 
@@ -37,13 +36,22 @@ const (
 	// BatchSplit can speed up the region split.
 	// and PD will response the BatchSplit request.
 	BatchSplit
+	Version3_0
+	Version4_0
+	Version5_0
+	// JointConsensus can support safe conf change across data center.
+	JointConsensus
 )
 
 var featuresDict = map[Feature]string{
-	Base:        "1.0.0",
-	Version2_0:  "2.0.0",
-	RegionMerge: "2.0.0",
-	BatchSplit:  "2.1.0-rc.1",
+	Base:           "1.0.0",
+	Version2_0:     "2.0.0",
+	RegionMerge:    "2.0.0",
+	BatchSplit:     "2.1.0-rc.1",
+	Version3_0:     "3.0.0",
+	Version4_0:     "4.0.0",
+	Version5_0:     "5.0.0",
+	JointConsensus: "5.0.0",
 }
 
 // MinSupportedVersion returns the minimum support version for the specified feature.
@@ -55,33 +63,3 @@ func MinSupportedVersion(v Feature) *semver.Version {
 	version := MustParseVersion(target)
 	return version
 }
-
-// ParseVersion wraps semver.NewVersion and handles compatibility issues.
-func ParseVersion(v string) (*semver.Version, error) {
-	// for compatibility with old version which not support `version` mechanism.
-	if v == "" {
-		return semver.New(featuresDict[Base]), nil
-	}
-	if v[0] == 'v' {
-		v = v[1:]
-	}
-	ver, err := semver.NewVersion(v)
-	return ver, errors.WithStack(err)
-}
-
-// MustParseVersion wraps ParseVersion and will panic if error is not nil.
-func MustParseVersion(v string) *semver.Version {
-	ver, err := ParseVersion(v)
-	if err != nil {
-		log.Fatal("version string is illegal", zap.Error(err))
-	}
-	return ver
-}
-
-// IsCompatible checks if the clusterVersion is compatible with the specified version.
-func IsCompatible(clusterVersion, v semver.Version) bool {
-	if clusterVersion.LessThan(v) {
-		return true
-	}
-	return clusterVersion.Major == v.Major && clusterVersion.Minor == v.Minor
-}
diff --git a/server/versioninfo/versioninfo.go b/server/versioninfo/versioninfo.go
index 71b4a2e3f6e..cd81814ea4c 100644
--- a/server/versioninfo/versioninfo.go
+++ b/server/versioninfo/versioninfo.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,6 +13,13 @@
 
 package versioninfo
 
+import (
+	"github.com/coreos/go-semver/semver"
+	"github.com/pingcap/errors"
+	"github.com/pingcap/log"
+	"go.uber.org/zap"
+)
+
 const (
 	// CommunityEdition is the default edition for building.
 	CommunityEdition = "Community"
@@ -26,3 +33,33 @@ var (
 	PDGitBranch      = "None"
 	PDEdition        = CommunityEdition
 )
+
+// ParseVersion wraps semver.NewVersion and handles compatibility issues.
+func ParseVersion(v string) (*semver.Version, error) {
+	// for compatibility with old version which not support `version` mechanism.
+	if v == "" {
+		return semver.New(featuresDict[Base]), nil
+	}
+	if v[0] == 'v' {
+		v = v[1:]
+	}
+	ver, err := semver.NewVersion(v)
+	return ver, errors.WithStack(err)
+}
+
+// MustParseVersion wraps ParseVersion and will panic if error is not nil.
+func MustParseVersion(v string) *semver.Version {
+	ver, err := ParseVersion(v)
+	if err != nil {
+		log.Fatal("version string is illegal", zap.Error(err))
+	}
+	return ver
+}
+
+// IsCompatible checks if the version a is compatible with the version b.
+func IsCompatible(a, b semver.Version) bool {
+	if a.LessThan(b) {
+		return true
+	}
+	return a.Major == b.Major && a.Minor == b.Minor
+}
diff --git a/tests/autoscaling/autoscaling_test.go b/tests/autoscaling/autoscaling_test.go
index d1c87011bfa..8897cb1f8c1 100644
--- a/tests/autoscaling/autoscaling_test.go
+++ b/tests/autoscaling/autoscaling_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"testing"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/tests"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/tests"
 	"go.uber.org/goleak"
 )
 
@@ -59,7 +59,6 @@ func (s *apiTestSuite) TestAPI(c *C) {
             "cpu_rule":{
                 "max_threshold":0.8,
                 "min_threshold":0.2,
-                "max_count":3,
                 "resource_type":[
                     "resource_a",
                     "resource_b"
@@ -67,13 +66,10 @@ func (s *apiTestSuite) TestAPI(c *C) {
             },
             "storage_rule":{
                 "min_threshold":0.2,
-                "max_count":3,
                 "resource_type":[
                     "resource_a"
                 ]
-            },
-            "scale_out_interval_seconds":30,
-            "scale_in_interval_seconds":30
+            }
         },
         {
             "component":"tidb",
@@ -84,26 +80,7 @@ func (s *apiTestSuite) TestAPI(c *C) {
                 "resource_type":[
                     "resource_a"
                 ]
-            },
-            "scale_out_interval_seconds":30,
-            "scale_in_interval_seconds":30
-        }
-    ],
-    "resource_expectations":[
-        {
-            "component":"tikv",
-            "cpu_expectation":4,
-            "count":8
-        },
-        {
-            "component":"tikv",
-            "cpu_expectation":8,
-            "count":2
-        },
-        {
-            "component":"tidb",
-            "cpu_expectation":2,
-            "count":2
+            }
         }
     ],
     "resources":[
@@ -111,13 +88,15 @@ func (s *apiTestSuite) TestAPI(c *C) {
             "resource_type":"resource_a",
             "cpu":1,
             "memory":8,
-            "storage":1000
+            "storage":1000,
+            "count": 2
         },
         {
             "resource_type":"resource_b",
             "cpu":2,
             "memory":4,
-            "storage":2000
+            "storage":2000,
+            "count": 4
         }
     ]
 }`)
diff --git a/tests/client/client_test.go b/tests/client/client_test.go
index 65cf0919577..035081980cf 100644
--- a/tests/client/client_test.go
+++ b/tests/client/client_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -28,12 +28,12 @@ import (
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	pd "github.com/pingcap/pd/v4/client"
-	"github.com/pingcap/pd/v4/pkg/mock/mockid"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tests"
+	pd "github.com/tikv/pd/client"
+	"github.com/tikv/pd/pkg/mock/mockid"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tests"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/goleak"
 )
@@ -205,9 +205,9 @@ func (s *clientTestSuite) TestCustomTimeout(c *C) {
 	c.Assert(err, IsNil)
 
 	start := time.Now()
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/customTimeout", "return(true)"), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/customTimeout", "return(true)"), IsNil)
 	_, err = cli.GetAllStores(context.TODO())
-	c.Assert(failpoint.Disable("github.com/pingcap/pd/v4/server/customTimeout"), IsNil)
+	c.Assert(failpoint.Disable("github.com/tikv/pd/server/customTimeout"), IsNil)
 	c.Assert(err, NotNil)
 	c.Assert(time.Since(start), GreaterEqual, 1*time.Second)
 	c.Assert(time.Since(start), Less, 2*time.Second)
@@ -676,7 +676,7 @@ func (s *testClientSuite) TestUpdateServiceGCSafePoint(c *C) {
 	c.Assert(min, Equals, uint64(3))
 
 	// Update only the TTL of the minimum safepoint
-	oldMinSsp, err := s.srv.GetStorage().LoadMinServiceGCSafePoint()
+	oldMinSsp, err := s.srv.GetStorage().LoadMinServiceGCSafePoint(time.Now())
 	c.Assert(err, IsNil)
 	c.Assert(oldMinSsp.ServiceID, Equals, "c")
 	c.Assert(oldMinSsp.SafePoint, Equals, uint64(3))
@@ -684,7 +684,7 @@ func (s *testClientSuite) TestUpdateServiceGCSafePoint(c *C) {
 		"c", 2000, 3)
 	c.Assert(err, IsNil)
 	c.Assert(min, Equals, uint64(3))
-	minSsp, err := s.srv.GetStorage().LoadMinServiceGCSafePoint()
+	minSsp, err := s.srv.GetStorage().LoadMinServiceGCSafePoint(time.Now())
 	c.Assert(err, IsNil)
 	c.Assert(minSsp.ServiceID, Equals, "c")
 	c.Assert(oldMinSsp.SafePoint, Equals, uint64(3))
@@ -695,7 +695,7 @@ func (s *testClientSuite) TestUpdateServiceGCSafePoint(c *C) {
 		"c", 1, 3)
 	c.Assert(err, IsNil)
 	c.Assert(min, Equals, uint64(3))
-	minSsp, err = s.srv.GetStorage().LoadMinServiceGCSafePoint()
+	minSsp, err = s.srv.GetStorage().LoadMinServiceGCSafePoint(time.Now())
 	c.Assert(err, IsNil)
 	c.Assert(minSsp.ServiceID, Equals, "c")
 	c.Assert(oldMinSsp.SafePoint, Equals, uint64(3))
diff --git a/tests/client/client_tsl_test.go b/tests/client/client_tsl_test.go
index c558485c191..81336dfbb2d 100644
--- a/tests/client/client_tsl_test.go
+++ b/tests/client/client_tsl_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,11 +23,11 @@ import (
 	"time"
 
 	. "github.com/pingcap/check"
-	pd "github.com/pingcap/pd/v4/client"
-	"github.com/pingcap/pd/v4/pkg/grpcutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/tests"
+	pd "github.com/tikv/pd/client"
+	"github.com/tikv/pd/pkg/grpcutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/tests"
 	"go.etcd.io/etcd/pkg/transport"
 	"google.golang.org/grpc"
 )
diff --git a/tests/cluster.go b/tests/cluster.go
index 72fa28639aa..5b579ec8222 100644
--- a/tests/cluster.go
+++ b/tests/cluster.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,21 +21,20 @@ import (
 	"time"
 
 	"github.com/coreos/go-semver/semver"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/autoscaling"
-	"github.com/pingcap/pd/v4/pkg/dashboard"
-	"github.com/pingcap/pd/v4/pkg/swaggerserver"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/api"
-	"github.com/pingcap/pd/v4/server/cluster"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/id"
-	"github.com/pingcap/pd/v4/server/join"
-	"github.com/pingcap/pd/v4/server/member"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/autoscaling"
+	"github.com/tikv/pd/pkg/dashboard"
+	"github.com/tikv/pd/pkg/swaggerserver"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/api"
+	"github.com/tikv/pd/server/cluster"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/id"
+	"github.com/tikv/pd/server/join"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
 )
@@ -133,7 +132,7 @@ func (s *TestServer) Destroy() error {
 func (s *TestServer) ResignLeader() error {
 	s.Lock()
 	defer s.Unlock()
-	return s.server.GetMember().ResignLeader(s.server.Context(), s.server.Name(), "")
+	return s.server.GetMember().ResignEtcdLeader(s.server.Context(), s.server.Name(), "")
 }
 
 // State returns the current TestServer's state.
@@ -321,7 +320,7 @@ func (s *TestServer) BootstrapCluster() error {
 	bootstrapReq := &pdpb.BootstrapRequest{
 		Header: &pdpb.RequestHeader{ClusterId: s.GetClusterID()},
 		Store:  &metapb.Store{Id: 1, Address: "mock://1"},
-		Region: &metapb.Region{Id: 2, Peers: []*metapb.Peer{{Id: 3, StoreId: 1, IsLearner: false}}},
+		Region: &metapb.Region{Id: 2, Peers: []*metapb.Peer{{Id: 3, StoreId: 1, Role: metapb.PeerRole_Voter}}},
 	}
 	_, err := s.server.Bootstrap(context.Background(), bootstrapReq)
 	if err != nil {
@@ -330,17 +329,17 @@ func (s *TestServer) BootstrapCluster() error {
 	return nil
 }
 
-// WaitLease is used to get leader lease.
+// WaitLeadership is used to get instant leadership in order to
+// make a test know the PD leader has been elected as soon as possible.
 // If it exceeds the maximum number of loops, it will return nil.
-func (s *TestServer) WaitLease() *member.LeaderLease {
+func (s *TestServer) WaitLeadership() bool {
 	for i := 0; i < 100; i++ {
-		lease := s.server.GetLease()
-		if lease != nil {
-			return lease
+		if s.server.GetLeadership().Check() {
+			return true
 		}
 		time.Sleep(WaitLeaderCheckInterval)
 	}
-	return nil
+	return false
 }
 
 // TestCluster is only for test.
diff --git a/tests/compatibility/version_upgrade_test.go b/tests/compatibility/version_upgrade_test.go
index 5985284e046..8fb7484fa9e 100644
--- a/tests/compatibility/version_upgrade_test.go
+++ b/tests/compatibility/version_upgrade_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/tests"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/tests"
 )
 
 func Test(t *testing.T) {
diff --git a/tests/config.go b/tests/config.go
index 348bd8441ce..4c12ce9141b 100644
--- a/tests/config.go
+++ b/tests/config.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/pingcap/pd/v4/pkg/tempurl"
-	"github.com/pingcap/pd/v4/server/config"
+	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/server/config"
 )
 
 type serverConfig struct {
diff --git a/tests/dashboard/race_test.go b/tests/dashboard/race_test.go
index d45858123b1..2bfd8d41b57 100644
--- a/tests/dashboard/race_test.go
+++ b/tests/dashboard/race_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@ import (
 
 	. "github.com/pingcap/check"
 
-	"github.com/pingcap/pd/v4/pkg/dashboard"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/tests"
+	"github.com/tikv/pd/pkg/dashboard"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/tests"
 
 	// Register schedulers.
-	_ "github.com/pingcap/pd/v4/server/schedulers"
+	_ "github.com/tikv/pd/server/schedulers"
 )
 
 var _ = Suite(&raceTestSuite{})
diff --git a/tests/dashboard/service_test.go b/tests/dashboard/service_test.go
index b9e7320a015..0817bc48060 100644
--- a/tests/dashboard/service_test.go
+++ b/tests/dashboard/service_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,15 +24,15 @@ import (
 	. "github.com/pingcap/check"
 	"go.uber.org/goleak"
 
-	"github.com/pingcap/pd/v4/pkg/dashboard"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pingcap/pd/v4/tests/pdctl"
+	"github.com/tikv/pd/pkg/dashboard"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/tests"
+	"github.com/tikv/pd/tests/pdctl"
 
 	// Register schedulers.
-	_ "github.com/pingcap/pd/v4/server/schedulers"
+	_ "github.com/tikv/pd/server/schedulers"
 )
 
 func Test(t *testing.T) {
diff --git a/tests/pdbackup/backup_test.go b/tests/pdbackup/backup_test.go
index 035fcf447a1..b539c07d116 100644
--- a/tests/pdbackup/backup_test.go
+++ b/tests/pdbackup/backup_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@ import (
 	"time"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pingcap/pd/v4/tools/pd-backup/pdbackup"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/tests"
+	"github.com/tikv/pd/tools/pd-backup/pdbackup"
 	"go.etcd.io/etcd/clientv3"
 )
 
diff --git a/tests/pdctl/cluster/cluster_test.go b/tests/pdctl/cluster/cluster_test.go
index 85026866531..8db77a7ac54 100644
--- a/tests/pdctl/cluster/cluster_test.go
+++ b/tests/pdctl/cluster/cluster_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server"
-	clusterpkg "github.com/pingcap/pd/v4/server/cluster"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pingcap/pd/v4/tests/pdctl"
+	"github.com/tikv/pd/server"
+	clusterpkg "github.com/tikv/pd/server/cluster"
+	"github.com/tikv/pd/tests"
+	"github.com/tikv/pd/tests/pdctl"
 )
 
 func Test(t *testing.T) {
diff --git a/tests/pdctl/completion/completion_test.go b/tests/pdctl/completion/completion_test.go
index d69fb9f4411..1fce4ab5e4a 100644
--- a/tests/pdctl/completion/completion_test.go
+++ b/tests/pdctl/completion/completion_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ import (
 	"testing"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/tests/pdctl"
+	"github.com/tikv/pd/tests/pdctl"
 )
 
 func Test(t *testing.T) {
diff --git a/tests/pdctl/config/config_test.go b/tests/pdctl/config/config_test.go
index ed541e66cf8..ee82ea597a4 100644
--- a/tests/pdctl/config/config_test.go
+++ b/tests/pdctl/config/config_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,12 +25,12 @@ import (
 	"github.com/coreos/go-semver/semver"
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pingcap/pd/v4/tests/pdctl"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/schedule/placement"
+	"github.com/tikv/pd/tests"
+	"github.com/tikv/pd/tests/pdctl"
 )
 
 func Test(t *testing.T) {
@@ -298,6 +298,69 @@ func (s *configTestSuite) TestPlacementRules(c *C) {
 	c.Assert(rules[0].Key(), Equals, [2]string{"pd", "test1"})
 }
 
+func (s *configTestSuite) TestPlacementRuleGroups(c *C) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	cluster, err := tests.NewTestCluster(ctx, 1)
+	c.Assert(err, IsNil)
+	err = cluster.RunInitialServers()
+	c.Assert(err, IsNil)
+	cluster.WaitLeader()
+	pdAddr := cluster.GetConfig().GetClientURL()
+	cmd := pdctl.InitCommand()
+
+	store := metapb.Store{
+		Id:    1,
+		State: metapb.StoreState_Up,
+	}
+	leaderServer := cluster.GetServer(cluster.GetLeader())
+	c.Assert(leaderServer.BootstrapCluster(), IsNil)
+	svr := leaderServer.GetServer()
+	pdctl.MustPutStore(c, svr, store.Id, store.State, store.Labels)
+	defer cluster.Destroy()
+
+	_, output, err := pdctl.ExecuteCommandC(cmd, "-u", pdAddr, "config", "placement-rules", "enable")
+	c.Assert(err, IsNil)
+	c.Assert(strings.Contains(string(output), "Success!"), IsTrue)
+
+	// test show
+	var group placement.RuleGroup
+	_, output, err = pdctl.ExecuteCommandC(cmd, "-u", pdAddr, "config", "placement-rules", "rule-group", "show", "pd")
+	c.Assert(err, IsNil)
+	err = json.Unmarshal(output, &group)
+	c.Assert(err, IsNil)
+	c.Assert(group, DeepEquals, placement.RuleGroup{ID: "pd"})
+
+	// test set
+	_, output, err = pdctl.ExecuteCommandC(cmd, "-u", pdAddr, "config", "placement-rules", "rule-group", "set", "pd", "42", "true")
+	c.Assert(err, IsNil)
+	c.Assert(strings.Contains(string(output), "Success!"), IsTrue)
+	_, output, err = pdctl.ExecuteCommandC(cmd, "-u", pdAddr, "config", "placement-rules", "rule-group", "set", "group2", "100", "false")
+	c.Assert(err, IsNil)
+	c.Assert(strings.Contains(string(output), "Success!"), IsTrue)
+
+	// show all
+	var groups []placement.RuleGroup
+	_, output, err = pdctl.ExecuteCommandC(cmd, "-u", pdAddr, "config", "placement-rules", "rule-group", "show")
+	c.Assert(err, IsNil)
+	err = json.Unmarshal(output, &groups)
+	c.Assert(err, IsNil)
+	c.Assert(groups, DeepEquals, []placement.RuleGroup{
+		{ID: "pd", Index: 42, Override: true},
+		{ID: "group2", Index: 100, Override: false},
+	})
+
+	// delete
+	_, output, err = pdctl.ExecuteCommandC(cmd, "-u", pdAddr, "config", "placement-rules", "rule-group", "delete", "group2")
+	c.Assert(err, IsNil)
+	c.Assert(strings.Contains(string(output), "Success!"), IsTrue)
+
+	// show again
+	_, output, err = pdctl.ExecuteCommandC(cmd, "-u", pdAddr, "config", "placement-rules", "rule-group", "show", "group2")
+	c.Assert(err, IsNil)
+	c.Assert(strings.Contains(string(output), "404"), IsTrue)
+}
+
 func (s *configTestSuite) TestReplicationMode(c *C) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
diff --git a/tests/pdctl/health/health_test.go b/tests/pdctl/health/health_test.go
index e8bfacdd201..0c1658ec594 100644
--- a/tests/pdctl/health/health_test.go
+++ b/tests/pdctl/health/health_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@ import (
 	"testing"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/api"
-	"github.com/pingcap/pd/v4/server/cluster"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pingcap/pd/v4/tests/pdctl"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/api"
+	"github.com/tikv/pd/server/cluster"
+	"github.com/tikv/pd/tests"
+	"github.com/tikv/pd/tests/pdctl"
 )
 
 func Test(t *testing.T) {
diff --git a/tests/pdctl/helper.go b/tests/pdctl/helper.go
index 37ddf69cbd6..07b95e4c64c 100644
--- a/tests/pdctl/helper.go
+++ b/tests/pdctl/helper.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,14 +26,14 @@ import (
 	"github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/api"
-	"github.com/pingcap/pd/v4/server/cluster"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pingcap/pd/v4/tools/pd-ctl/pdctl"
-	"github.com/pingcap/pd/v4/tools/pd-ctl/pdctl/command"
 	"github.com/spf13/cobra"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/api"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/versioninfo"
+	"github.com/tikv/pd/tests"
+	"github.com/tikv/pd/tools/pd-ctl/pdctl"
+	"github.com/tikv/pd/tools/pd-ctl/pdctl/command"
 )
 
 // InitCommand is used to initialize command.
@@ -118,7 +118,7 @@ func MustPutStore(c *check.C, svr *server.Server, id uint64, state metapb.StoreS
 			Address: fmt.Sprintf("tikv%d", id),
 			State:   state,
 			Labels:  labels,
-			Version: (*cluster.MinSupportedVersion(cluster.Version2_0)).String(),
+			Version: versioninfo.MinSupportedVersion(versioninfo.Version2_0).String(),
 		},
 	})
 	c.Assert(err, check.IsNil)
diff --git a/tests/pdctl/hot/hot_test.go b/tests/pdctl/hot/hot_test.go
index e05cc08d4c8..270ddb9cd63 100644
--- a/tests/pdctl/hot/hot_test.go
+++ b/tests/pdctl/hot/hot_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,12 +23,12 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/api"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/statistics"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pingcap/pd/v4/tests/pdctl"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/api"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/statistics"
+	"github.com/tikv/pd/tests"
+	"github.com/tikv/pd/tests/pdctl"
 )
 
 func Test(t *testing.T) {
diff --git a/tests/pdctl/label/label_test.go b/tests/pdctl/label/label_test.go
index 6c3902b99e2..11a7ca80a8e 100644
--- a/tests/pdctl/label/label_test.go
+++ b/tests/pdctl/label/label_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/api"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pingcap/pd/v4/tests/pdctl"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/api"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/tests"
+	"github.com/tikv/pd/tests/pdctl"
 )
 
 func Test(t *testing.T) {
diff --git a/tests/pdctl/log/log_test.go b/tests/pdctl/log/log_test.go
index 5b37a9d3b89..e9e5fd72097 100644
--- a/tests/pdctl/log/log_test.go
+++ b/tests/pdctl/log/log_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pingcap/pd/v4/tests/pdctl"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/tests"
+	"github.com/tikv/pd/tests/pdctl"
 )
 
 func Test(t *testing.T) {
diff --git a/tests/pdctl/member/member_test.go b/tests/pdctl/member/member_test.go
index e3fc23e0827..9bcea7f3d78 100644
--- a/tests/pdctl/member/member_test.go
+++ b/tests/pdctl/member/member_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,16 +16,17 @@ package member_test
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"strings"
 	"testing"
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pingcap/pd/v4/tests/pdctl"
+	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/tests"
+	"github.com/tikv/pd/tests/pdctl"
 )
 
 func Test(t *testing.T) {
@@ -108,7 +109,7 @@ func (s *memberTestSuite) TestMember(c *C) {
 	c.Assert(len(members.Members), Equals, 2)
 
 	// member delete id <member_id>
-	args = []string{"-u", pdAddr, "member", "delete", "id", string(id)}
+	args = []string{"-u", pdAddr, "member", "delete", "id", fmt.Sprint(id)}
 	_, _, err = pdctl.ExecuteCommandC(cmd, args...)
 	c.Assert(err, IsNil)
 	members, err = etcdutil.ListEtcdMembers(client)
diff --git a/tests/pdctl/operator/operator_test.go b/tests/pdctl/operator/operator_test.go
index 5c303c71471..8a8b75d5d91 100644
--- a/tests/pdctl/operator/operator_test.go
+++ b/tests/pdctl/operator/operator_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pingcap/pd/v4/tests/pdctl"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tests"
+	"github.com/tikv/pd/tests/pdctl"
 )
 
 func Test(t *testing.T) {
diff --git a/tests/pdctl/region/region_test.go b/tests/pdctl/region/region_test.go
index 8d521c44107..2dc76c1096d 100644
--- a/tests/pdctl/region/region_test.go
+++ b/tests/pdctl/region/region_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/api"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pingcap/pd/v4/tests/pdctl"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/api"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tests"
+	"github.com/tikv/pd/tests/pdctl"
 )
 
 func Test(t *testing.T) {
diff --git a/tests/pdctl/scheduler/scheduler_test.go b/tests/pdctl/scheduler/scheduler_test.go
index 896a7b9c3e6..c3041fb088f 100644
--- a/tests/pdctl/scheduler/scheduler_test.go
+++ b/tests/pdctl/scheduler/scheduler_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pingcap/pd/v4/tests/pdctl"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/tests"
+	"github.com/tikv/pd/tests/pdctl"
 )
 
 func Test(t *testing.T) {
diff --git a/tests/pdctl/store/store_test.go b/tests/pdctl/store/store_test.go
index 67aeddd370c..e136e909864 100644
--- a/tests/pdctl/store/store_test.go
+++ b/tests/pdctl/store/store_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/api"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pingcap/pd/v4/tests/pdctl"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/api"
+	"github.com/tikv/pd/server/schedule/storelimit"
+	"github.com/tikv/pd/tests"
+	"github.com/tikv/pd/tests/pdctl"
 )
 
 func Test(t *testing.T) {
@@ -208,14 +208,16 @@ func (s *storeTestSuite) TestStore(c *C) {
 	json.Unmarshal([]byte(echo), &allAddPeerLimit)
 	c.Assert(allAddPeerLimit["1"]["add-peer"].(float64), Equals, float64(20))
 	c.Assert(allAddPeerLimit["3"]["add-peer"].(float64), Equals, float64(20))
-	c.Assert(allAddPeerLimit["2"]["add-peer"].(float64), Equals, float64(20))
+	_, ok := allAddPeerLimit["2"]["add-peer"]
+	c.Assert(ok, Equals, false)
 
 	echo = pdctl.GetEcho([]string{"-u", pdAddr, "store", "limit", "remove-peer"})
 	allRemovePeerLimit := make(map[string]map[string]interface{})
 	json.Unmarshal([]byte(echo), &allRemovePeerLimit)
 	c.Assert(allRemovePeerLimit["1"]["remove-peer"].(float64), Equals, float64(25))
 	c.Assert(allRemovePeerLimit["3"]["remove-peer"].(float64), Equals, float64(25))
-	c.Assert(allRemovePeerLimit["2"]["remove-peer"].(float64), Equals, float64(25))
+	_, ok = allRemovePeerLimit["2"]["add-peer"]
+	c.Assert(ok, Equals, false)
 
 	// store delete <store_id> command
 	c.Assert(storeInfo.Store.State, Equals, metapb.StoreState_Up)
diff --git a/tests/pdctl/tso/tso_test.go b/tests/pdctl/tso/tso_test.go
index 5f8d96c49ce..379d6440050 100644
--- a/tests/pdctl/tso/tso_test.go
+++ b/tests/pdctl/tso/tso_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"time"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/tests/pdctl"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/tests/pdctl"
 )
 
 func Test(t *testing.T) {
diff --git a/tests/server/api/api_test.go b/tests/server/api/api_test.go
index 82f6023b4b0..8fe18463f98 100644
--- a/tests/server/api/api_test.go
+++ b/tests/server/api/api_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,12 +21,12 @@ import (
 	"time"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/pkg/apiutil/serverapi"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/tests"
+	"github.com/tikv/pd/pkg/apiutil/serverapi"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/tests"
 	"go.uber.org/goleak"
 )
 
diff --git a/tests/server/cluster/cluster_test.go b/tests/server/cluster/cluster_test.go
index 43988db2648..b52bfdeb862 100644
--- a/tests/server/cluster/cluster_test.go
+++ b/tests/server/cluster/cluster_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,23 +22,23 @@ import (
 
 	"github.com/coreos/go-semver/semver"
 	. "github.com/pingcap/check"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/kvproto/pkg/replication_modepb"
-	"github.com/pingcap/pd/v4/pkg/dashboard"
-	"github.com/pingcap/pd/v4/pkg/mock/mockid"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/cluster"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/server/kv"
-	syncer "github.com/pingcap/pd/v4/server/region_syncer"
-	"github.com/pingcap/pd/v4/server/schedule/operator"
-	"github.com/pingcap/pd/v4/server/schedule/storelimit"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/dashboard"
+	"github.com/tikv/pd/pkg/mock/mockid"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/cluster"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/server/kv"
+	syncer "github.com/tikv/pd/server/region_syncer"
+	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/server/schedule/storelimit"
+	"github.com/tikv/pd/tests"
 )
 
 func Test(t *testing.T) {
@@ -372,7 +372,7 @@ func (s *clusterTestSuite) TestRaftClusterMultipleRestart(c *C) {
 	c.Assert(tc, NotNil)
 
 	// let the job run at small interval
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/highFrequencyClusterJobs", `return(true)`), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/highFrequencyClusterJobs", `return(true)`), IsNil)
 	for i := 0; i < 100; i++ {
 		err = rc.Start(leaderServer.GetServer())
 		c.Assert(err, IsNil)
@@ -428,7 +428,7 @@ func (s *clusterTestSuite) TestStoreVersionChange(c *C) {
 	c.Assert(err, IsNil)
 	store := newMetaStore(storeID, "127.0.0.1:4", "2.1.0", metapb.StoreState_Up, fmt.Sprintf("test/store%d", storeID))
 	var wg sync.WaitGroup
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/versionChangeConcurrency", `return(true)`), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/versionChangeConcurrency", `return(true)`), IsNil)
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
@@ -441,7 +441,7 @@ func (s *clusterTestSuite) TestStoreVersionChange(c *C) {
 	v, err := semver.NewVersion("1.0.0")
 	c.Assert(err, IsNil)
 	c.Assert(svr.GetClusterVersion(), Equals, *v)
-	c.Assert(failpoint.Disable("github.com/pingcap/pd/v4/server/versionChangeConcurrency"), IsNil)
+	c.Assert(failpoint.Disable("github.com/tikv/pd/server/versionChangeConcurrency"), IsNil)
 }
 
 func (s *clusterTestSuite) TestConcurrentHandleRegion(c *C) {
@@ -808,7 +808,7 @@ func newBootstrapRequest(c *C, clusterID uint64, storeAddr string) *pdpb.Bootstr
 	req := &pdpb.BootstrapRequest{
 		Header: testutil.NewRequestHeader(clusterID),
 		Store:  &metapb.Store{Id: 1, Address: storeAddr},
-		Region: &metapb.Region{Id: 2, Peers: []*metapb.Peer{{Id: 3, StoreId: 1, IsLearner: false}}},
+		Region: &metapb.Region{Id: 2, Peers: []*metapb.Peer{{Id: 3, StoreId: 1, Role: metapb.PeerRole_Voter}}},
 	}
 
 	return req
diff --git a/tests/server/cluster/cluster_work_test.go b/tests/server/cluster/cluster_work_test.go
index 119fc17ef12..ef4fc83f88f 100644
--- a/tests/server/cluster/cluster_work_test.go
+++ b/tests/server/cluster/cluster_work_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tests"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tests"
 )
 
 var _ = Suite(&clusterWorkerTestSuite{})
diff --git a/tests/server/id/id_test.go b/tests/server/id/id_test.go
index 020473a5468..8419f26b657 100644
--- a/tests/server/id/id_test.go
+++ b/tests/server/id/id_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/tests"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/tests"
 	"go.uber.org/goleak"
 )
 
diff --git a/tests/server/join/join_fail/join_fail_test.go b/tests/server/join/join_fail/join_fail_test.go
index c25bc042826..a765954bfec 100644
--- a/tests/server/join/join_fail/join_fail_test.go
+++ b/tests/server/join/join_fail/join_fail_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/failpoint"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/tests"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/tests"
 	"go.uber.org/goleak"
 )
 
@@ -54,9 +54,9 @@ func (s *joinTestSuite) TestFailedPDJoinInStep1(c *C) {
 	cluster.WaitLeader()
 
 	// Join the second PD.
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/join/add-member-failed", `return`), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/join/add-member-failed", `return`), IsNil)
 	_, err = cluster.Join(ctx)
 	c.Assert(err, NotNil)
 	c.Assert(strings.Contains(err.Error(), "join failed"), IsTrue)
-	c.Assert(failpoint.Disable("github.com/pingcap/pd/v4/server/join/add-member-failed"), IsNil)
+	c.Assert(failpoint.Disable("github.com/tikv/pd/server/join/add-member-failed"), IsNil)
 }
diff --git a/tests/server/join/join_test.go b/tests/server/join/join_test.go
index 4412edf5139..4464b948fcd 100644
--- a/tests/server/join/join_test.go
+++ b/tests/server/join/join_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ import (
 	"time"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/join"
-	"github.com/pingcap/pd/v4/tests"
+	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/join"
+	"github.com/tikv/pd/tests"
 )
 
 func Test(t *testing.T) {
diff --git a/tests/server/member/member_test.go b/tests/server/member/member_test.go
index 64d2114ff2b..2e5462ee9ae 100644
--- a/tests/server/member/member_test.go
+++ b/tests/server/member/member_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,12 +25,12 @@ import (
 	"time"
 
 	. "github.com/pingcap/check"
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/tests"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/tests"
 	"go.uber.org/goleak"
 )
 
diff --git a/tests/server/region_syncer/region_syncer_test.go b/tests/server/region_syncer/region_syncer_test.go
index 566bc03f0be..c75f7182f8c 100644
--- a/tests/server/region_syncer/region_syncer_test.go
+++ b/tests/server/region_syncer/region_syncer_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,12 +20,12 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/mock/mockid"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tests"
+	"github.com/tikv/pd/pkg/mock/mockid"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tests"
 	"go.uber.org/goleak"
 )
 
diff --git a/tests/server/server_test.go b/tests/server/server_test.go
index 5357d849261..6e3c5e75d36 100644
--- a/tests/server/server_test.go
+++ b/tests/server/server_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,15 +18,15 @@ import (
 	"testing"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/pkg/tempurl"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/tests"
+	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/tests"
 	"go.uber.org/goleak"
 
 	// Register schedulers.
-	_ "github.com/pingcap/pd/v4/server/schedulers"
+	_ "github.com/tikv/pd/server/schedulers"
 )
 
 func Test(t *testing.T) {
diff --git a/tests/server/tso/tso_test.go b/tests/server/tso/tso_test.go
index 93f1d6d361d..ce0a089247f 100644
--- a/tests/server/tso/tso_test.go
+++ b/tests/server/tso/tso_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/tests"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/tests"
 	"go.uber.org/goleak"
 )
 
@@ -240,11 +240,11 @@ func (s *testTsoSuite) TestDeplaySyncTimestamp(c *C) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/tso/delaySyncTimestamp", `return(true)`), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/tso/delaySyncTimestamp", `return(true)`), IsNil)
 
 	// Make the old leader resign and wait for the new leader to get a lease
 	leaderServer.ResignLeader()
-	c.Assert(nextLeaderServer.WaitLease(), NotNil)
+	c.Assert(nextLeaderServer.WaitLeadership(), IsTrue)
 
 	tsoClient, err := grpcPDClient.Tso(ctx)
 	c.Assert(err, IsNil)
@@ -254,7 +254,7 @@ func (s *testTsoSuite) TestDeplaySyncTimestamp(c *C) {
 	resp, err := tsoClient.Recv()
 	c.Assert(err, IsNil)
 	c.Assert(resp.GetCount(), Equals, uint32(1))
-	failpoint.Disable("github.com/pingcap/pd/v4/server/tso/delaySyncTimestamp")
+	failpoint.Disable("github.com/tikv/pd/server/tso/delaySyncTimestamp")
 }
 
 var _ = Suite(&testTimeFallBackSuite{})
@@ -269,8 +269,8 @@ type testTimeFallBackSuite struct {
 
 func (s *testTimeFallBackSuite) SetUpSuite(c *C) {
 	s.ctx, s.cancel = context.WithCancel(context.Background())
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/tso/fallBackSync", `return(true)`), IsNil)
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/tso/fallBackUpdate", `return(true)`), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/tso/fallBackSync", `return(true)`), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/tso/fallBackUpdate", `return(true)`), IsNil)
 	var err error
 	s.cluster, err = tests.NewTestCluster(s.ctx, 1)
 	c.Assert(err, IsNil)
@@ -283,8 +283,8 @@ func (s *testTimeFallBackSuite) SetUpSuite(c *C) {
 	s.grpcPDClient = testutil.MustNewGrpcClient(c, s.server.GetAddr())
 	svr := s.server.GetServer()
 	svr.Close()
-	failpoint.Disable("github.com/pingcap/pd/v4/server/tso/fallBackSync")
-	failpoint.Disable("github.com/pingcap/pd/v4/server/tso/fallBackUpdate")
+	failpoint.Disable("github.com/tikv/pd/server/tso/fallBackSync")
+	failpoint.Disable("github.com/tikv/pd/server/tso/fallBackUpdate")
 	err = svr.Run()
 	c.Assert(err, IsNil)
 	s.cluster.WaitLeader()
@@ -364,7 +364,7 @@ func (s *testFollowerTsoSuite) TearDownSuite(c *C) {
 }
 
 func (s *testFollowerTsoSuite) TestRequest(c *C) {
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/tso/skipRetryGetTS", `return(true)`), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/tso/skipRetryGetTS", `return(true)`), IsNil)
 	var err error
 	cluster, err := tests.NewTestCluster(s.ctx, 2)
 	defer cluster.Destroy()
@@ -396,5 +396,5 @@ func (s *testFollowerTsoSuite) TestRequest(c *C) {
 	_, err = tsoClient.Recv()
 	c.Assert(err, NotNil)
 	c.Assert(strings.Contains(err.Error(), "can not get timestamp"), IsTrue)
-	failpoint.Disable("github.com/pingcap/pd/v4/server/tso/skipRetryGetTS")
+	failpoint.Disable("github.com/tikv/pd/server/tso/skipRetryGetTS")
 }
diff --git a/tests/server/watch/leader_watch_test.go b/tests/server/watch/leader_watch_test.go
index 33974348b89..87d8ad01592 100644
--- a/tests/server/watch/leader_watch_test.go
+++ b/tests/server/watch/leader_watch_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,10 +20,10 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/failpoint"
-	"github.com/pingcap/pd/v4/pkg/testutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/tests"
+	"github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/tests"
 	"go.uber.org/goleak"
 )
 
@@ -71,7 +71,7 @@ func (s *serverTestSuite) TestWatcher(c *C) {
 	time.Sleep(5 * time.Second)
 	pd3, err := cluster.Join(s.ctx)
 	c.Assert(err, IsNil)
-	c.Assert(failpoint.Enable("github.com/pingcap/pd/v4/server/delayWatcher", `pause`), IsNil)
+	c.Assert(failpoint.Enable("github.com/tikv/pd/server/delayWatcher", `pause`), IsNil)
 	err = pd3.Run()
 	c.Assert(err, IsNil)
 	time.Sleep(200 * time.Millisecond)
@@ -80,7 +80,7 @@ func (s *serverTestSuite) TestWatcher(c *C) {
 	c.Assert(err, IsNil)
 	cluster.WaitLeader()
 	c.Assert(pd2.GetLeader().GetName(), Equals, pd2.GetConfig().Name)
-	failpoint.Disable("github.com/pingcap/pd/v4/server/delayWatcher")
+	failpoint.Disable("github.com/tikv/pd/server/delayWatcher")
 	testutil.WaitUntil(c, func(c *C) bool {
 		return c.Check(pd3.GetLeader().GetName(), Equals, pd2.GetConfig().Name)
 	})
diff --git a/tools.go b/tools.go
index 658f6d9e3d4..086f34c6678 100644
--- a/tools.go
+++ b/tools.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-analysis/analysis/parse_log.go b/tools/pd-analysis/analysis/parse_log.go
index 099454f4516..9a6cead3789 100644
--- a/tools/pd-analysis/analysis/parse_log.go
+++ b/tools/pd-analysis/analysis/parse_log.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,7 +24,8 @@ import (
 	"time"
 )
 
-var supportOperators = []string{"balance-region", "balance-leader", "transfer-hot-read-leader", "move-hot-read-region", "transfer-hot-write-leader", "move-hot-write-region"}
+var regionOperators = []string{"balance-region", "move-hot-read-region", "move-hot-write-region"}
+var leaderOperators = []string{"balance-leader", "transfer-hot-read-leader", "transfer-hot-write-leader"}
 
 // DefaultLayout is the default layout to parse log.
 const DefaultLayout = "2006/01/02 15:04:05"
@@ -44,8 +45,14 @@ func (c *TransferCounter) CompileRegex(operator string) (*regexp.Regexp, error)
 	var r *regexp.Regexp
 	var err error
 
-	for _, supportOperator := range supportOperators {
-		if operator == supportOperator {
+	for _, regionOperator := range regionOperators {
+		if operator == regionOperator {
+			r, err = regexp.Compile(".*?operator finish.*?region-id=([0-9]*).*?" + operator + ".*?store \\[([0-9]*)\\] to \\[([0-9]*)\\].*?")
+		}
+	}
+
+	for _, leaderOperator := range leaderOperators {
+		if operator == leaderOperator {
 			r, err = regexp.Compile(".*?operator finish.*?region-id=([0-9]*).*?" + operator + ".*?store ([0-9]*) to ([0-9]*).*?")
 		}
 	}
diff --git a/tools/pd-analysis/analysis/parse_log_test.go b/tools/pd-analysis/analysis/parse_log_test.go
index 8faedda5b77..f3d36c717af 100644
--- a/tools/pd-analysis/analysis/parse_log_test.go
+++ b/tools/pd-analysis/analysis/parse_log_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ func (t *testParseLog) TestTransferCounterParseLog(c *C) {
 	}
 	{
 		operator := "balance-region"
-		content := "[2019/09/03 17:42:07.898 +08:00] [INFO] [operator_controller.go:119] [\"operator finish\"] [region-id=24622] [operator=\"\"balance-region {mv peer: store 6 to 1} (kind:region,balance, region:24622(1,1), createAt:2019-09-03 17:42:06.602589701 +0800 CST m=+737.457773921, startAt:2019-09-03 17:42:06.602849306 +0800 CST m=+737.458033475, currentStep:3, steps:[add learner peer 64064 on store 1, promote learner peer 64064 on store 1 to voter, remove peer on store 6]) finished\"\"]\""
+		content := "[2019/09/03 17:42:07.898 +08:00] [INFO] [operator_controller.go:119] [\"operator finish\"] [region-id=24622] [operator=\"\"balance-region {mv peer: store [6] to [1]} (kind:region,balance, region:24622(1,1), createAt:2019-09-03 17:42:06.602589701 +0800 CST m=+737.457773921, startAt:2019-09-03 17:42:06.602849306 +0800 CST m=+737.458033475, currentStep:3, steps:[add learner peer 64064 on store 1, promote learner peer 64064 on store 1 to voter, remove peer on store 6]) finished\"\"]\""
 		var expect = []uint64{24622, 6, 1}
 		c.Assert(transferCounterParseLog(operator, content, expect), Equals, true)
 	}
@@ -63,7 +63,7 @@ func (t *testParseLog) TestTransferCounterParseLog(c *C) {
 	}
 	{
 		operator := "move-hot-write-region"
-		content := "[2019/09/05 14:05:54.311 +08:00] [INFO] [operator_controller.go:119] [\"operator finish\"] [region-id=98] [operator=\"\"move-hot-write-region {mv peer: store 2 to 10} (kind:region,hot-region, region:98(1,1), createAt:2019-09-05 14:05:49.718201432 +0800 CST m=+21.997446945, startAt:2019-09-05 14:05:49.718336308 +0800 CST m=+21.997581822, currentStep:3, steps:[add learner peer 2048 on store 10, promote learner peer 2048 on store 10 to voter, remove peer on store 2]) finished\"\"]"
+		content := "[2019/09/05 14:05:54.311 +08:00] [INFO] [operator_controller.go:119] [\"operator finish\"] [region-id=98] [operator=\"\"move-hot-write-region {mv peer: store [2] to [10]} (kind:region,hot-region, region:98(1,1), createAt:2019-09-05 14:05:49.718201432 +0800 CST m=+21.997446945, startAt:2019-09-05 14:05:49.718336308 +0800 CST m=+21.997581822, currentStep:3, steps:[add learner peer 2048 on store 10, promote learner peer 2048 on store 10 to voter, remove peer on store 2]) finished\"\"]"
 		var expect = []uint64{98, 2, 10}
 		c.Assert(transferCounterParseLog(operator, content, expect), Equals, true)
 	}
@@ -75,7 +75,7 @@ func (t *testParseLog) TestTransferCounterParseLog(c *C) {
 	}
 	{
 		operator := "move-hot-read-region"
-		content := "[2019/09/05 14:19:15.066 +08:00] [INFO] [operator_controller.go:119] [\"operator finish\"] [region-id=389] [operator=\"\"move-hot-read-region {mv peer: store 5 to 4} (kind:leader,region,hot-region, region:389(1,1), createAt:2019-09-05 14:19:13.576359364 +0800 CST m=+25.855737101, startAt:2019-09-05 14:19:13.576556556 +0800 CST m=+25.855934288, currentStep:4, steps:[add learner peer 2014 on store 4, promote learner peer 2014 on store 4 to voter, transfer leader from store 5 to store 3, remove peer on store 5]) finished\"\"]"
+		content := "[2019/09/05 14:19:15.066 +08:00] [INFO] [operator_controller.go:119] [\"operator finish\"] [region-id=389] [operator=\"\"move-hot-read-region {mv peer: store [5] to [4]} (kind:leader,region,hot-region, region:389(1,1), createAt:2019-09-05 14:19:13.576359364 +0800 CST m=+25.855737101, startAt:2019-09-05 14:19:13.576556556 +0800 CST m=+25.855934288, currentStep:4, steps:[add learner peer 2014 on store 4, promote learner peer 2014 on store 4 to voter, transfer leader from store 5 to store 3, remove peer on store 5]) finished\"\"]"
 		var expect = []uint64{389, 5, 4}
 		c.Assert(transferCounterParseLog(operator, content, expect), Equals, true)
 	}
diff --git a/tools/pd-analysis/analysis/transfer_counter.go b/tools/pd-analysis/analysis/transfer_counter.go
index f72bb872d6b..3f6de6278a6 100644
--- a/tools/pd-analysis/analysis/transfer_counter.go
+++ b/tools/pd-analysis/analysis/transfer_counter.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-analysis/analysis/transfer_counter_test.go b/tools/pd-analysis/analysis/transfer_counter_test.go
index ad4d24b0880..da8d2036c8a 100644
--- a/tools/pd-analysis/analysis/transfer_counter_test.go
+++ b/tools/pd-analysis/analysis/transfer_counter_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-analysis/main.go b/tools/pd-analysis/main.go
index afcbddf9800..7005de5bb4a 100644
--- a/tools/pd-analysis/main.go
+++ b/tools/pd-analysis/main.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ import (
 	"os"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/tools/pd-analysis/analysis"
+	"github.com/tikv/pd/tools/pd-analysis/analysis"
 	"go.uber.org/zap"
 )
 
diff --git a/tools/pd-backup/main.go b/tools/pd-backup/main.go
index b41222f1964..70294aab375 100644
--- a/tools/pd-backup/main.go
+++ b/tools/pd-backup/main.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pingcap/pd/v4/tools/pd-backup/pdbackup"
+	"github.com/tikv/pd/tools/pd-backup/pdbackup"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/pkg/transport"
 )
diff --git a/tools/pd-backup/pdbackup/backup.go b/tools/pd-backup/pdbackup/backup.go
index 500c1413c43..71df2595b3e 100644
--- a/tools/pd-backup/pdbackup/backup.go
+++ b/tools/pd-backup/pdbackup/backup.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@ import (
 	"path"
 	"strconv"
 
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server/config"
+	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/config"
 	"go.etcd.io/etcd/clientv3"
 )
 
diff --git a/tools/pd-ctl/README.md b/tools/pd-ctl/README.md
index 4f14ae7a899..ab762e68611 100644
--- a/tools/pd-ctl/README.md
+++ b/tools/pd-ctl/README.md
@@ -5,7 +5,7 @@
 ## Build
 
 1. [Go](https://golang.org/) Version 1.13 or later
-2. In the root directory of the [PD project](https://github.com/pingcap/pd), use the `make pd-ctl` command to compile and generate `bin/pd-ctl`.
+2. In the root directory of the [PD project](https://github.com/tikv/pd), use the `make pd-ctl` command to compile and generate `bin/pd-ctl`.
 
 ## Usage
 
diff --git a/tools/pd-ctl/main.go b/tools/pd-ctl/main.go
index 537477e79f0..3e336bfa0d2 100644
--- a/tools/pd-ctl/main.go
+++ b/tools/pd-ctl/main.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/pingcap/pd/v4/tools/pd-ctl/pdctl"
+	"github.com/tikv/pd/tools/pd-ctl/pdctl"
 )
 
 func main() {
diff --git a/tools/pd-ctl/pdctl/command/cluster_command.go b/tools/pd-ctl/pdctl/command/cluster_command.go
index de99a88be4f..7e3daa72abf 100644
--- a/tools/pd-ctl/pdctl/command/cluster_command.go
+++ b/tools/pd-ctl/pdctl/command/cluster_command.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-ctl/pdctl/command/completion_command.go b/tools/pd-ctl/pdctl/command/completion_command.go
index 1482c1079d3..5803f1b2eba 100644
--- a/tools/pd-ctl/pdctl/command/completion_command.go
+++ b/tools/pd-ctl/pdctl/command/completion_command.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-ctl/pdctl/command/config_command.go b/tools/pd-ctl/pdctl/command/config_command.go
index d4d77e5a6b4..6585346c328 100644
--- a/tools/pd-ctl/pdctl/command/config_command.go
+++ b/tools/pd-ctl/pdctl/command/config_command.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@ package command
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"net/http"
 	"path"
@@ -24,9 +23,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/schedule/placement"
 	"github.com/spf13/cobra"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/schedule/placement"
 )
 
 var (
@@ -36,7 +35,10 @@ var (
 	labelPropertyPrefix   = "pd/api/v1/config/label-property"
 	clusterVersionPrefix  = "pd/api/v1/config/cluster-version"
 	rulesPrefix           = "pd/api/v1/config/rules"
+	rulesBatchPrefix      = "pd/api/v1/config/rules/batch"
 	rulePrefix            = "pd/api/v1/config/rule"
+	ruleGroupPrefix       = "pd/api/v1/config/rule_group"
+	ruleGroupsPrefix      = "pd/api/v1/config/rule_groups"
 	replicationModePrefix = "pd/api/v1/config/replication-mode"
 )
 
@@ -428,7 +430,27 @@ func NewPlacementRulesCommand() *cobra.Command {
 		Run:   putPlacementRulesFunc,
 	}
 	save.Flags().String("in", "rules.json", "the filename contains rules")
-	c.AddCommand(enable, disable, show, load, save)
+	ruleGroup := &cobra.Command{
+		Use:   "rule-group",
+		Short: "rule group configurations",
+	}
+	ruleGroupShow := &cobra.Command{
+		Use:   "show [id]",
+		Short: "show rule group configuration(s)",
+		Run:   showRuleGroupFunc,
+	}
+	ruleGroupSet := &cobra.Command{
+		Use:   "set <id> <index> <override>",
+		Short: "update rule group configuration",
+		Run:   updateRuleGroupFunc,
+	}
+	ruleGroupDelete := &cobra.Command{
+		Use:   "delete <id>",
+		Short: "delete rule group configuration",
+		Run:   deleteRuleGroupFunc,
+	}
+	ruleGroup.AddCommand(ruleGroupShow, ruleGroupSet, ruleGroupDelete)
+	c.AddCommand(enable, disable, show, load, save, ruleGroup)
 	return c
 }
 
@@ -507,31 +529,88 @@ func putPlacementRulesFunc(cmd *cobra.Command, args []string) {
 		cmd.Println(err)
 		return
 	}
-	var rules []*placement.Rule
-	if err = json.Unmarshal(content, &rules); err != nil {
+
+	var opts []*placement.RuleOp
+	if err = json.Unmarshal(content, &opts); err != nil {
 		cmd.Println(err)
 		return
 	}
-	for _, r := range rules {
-		if r.Count > 0 {
-			b, _ := json.Marshal(r)
-			_, err = doRequest(cmd, rulePrefix, http.MethodPost, WithBody("application/json", bytes.NewBuffer(b)))
-			if err != nil {
-				fmt.Printf("failed to save rule %s/%s: %v\n", r.GroupID, r.ID, err)
-				return
-			}
-			fmt.Printf("saved rule %s/%s\n", r.GroupID, r.ID)
+
+	validOpts := opts[:0]
+	for _, op := range opts {
+		if op.Count > 0 {
+			op.Action = placement.RuleOpAdd
+			validOpts = append(validOpts, op)
+		} else if op.Count == 0 {
+			op.Action = placement.RuleOpDel
+			validOpts = append(validOpts, op)
 		}
 	}
-	for _, r := range rules {
-		if r.Count == 0 {
-			_, err = doRequest(cmd, path.Join(rulePrefix, r.GroupID, r.ID), http.MethodDelete)
-			if err != nil {
-				fmt.Printf("failed to delete rule %s/%s: %v\n", r.GroupID, r.ID, err)
-				return
-			}
-			fmt.Printf("deleted rule %s/%s\n", r.GroupID, r.ID)
-		}
+
+	b, _ := json.Marshal(validOpts)
+	_, err = doRequest(cmd, rulesBatchPrefix, http.MethodPost, WithBody("application/json", bytes.NewBuffer(b)))
+	if err != nil {
+		cmd.Printf("failed to save rules %s: %s\n", b, err)
+		return
+	}
+
+	cmd.Println("Success!")
+}
+
+func showRuleGroupFunc(cmd *cobra.Command, args []string) {
+	if len(args) > 1 {
+		cmd.Println(cmd.UsageString())
+		return
+	}
+
+	reqPath := ruleGroupsPrefix
+	if len(args) > 0 {
+		reqPath = path.Join(ruleGroupPrefix, args[0])
+	}
+
+	res, err := doRequest(cmd, reqPath, http.MethodGet)
+	if err != nil {
+		cmd.Println(err)
+		return
+	}
+	cmd.Println(res)
+}
+
+func updateRuleGroupFunc(cmd *cobra.Command, args []string) {
+	if len(args) != 3 {
+		cmd.Println(cmd.UsageString())
+		return
+	}
+	index, err := strconv.ParseInt(args[1], 10, 64)
+	if err != nil {
+		cmd.Printf("index %s should be a number\n", args[1])
+		return
+	}
+	var override bool
+	switch strings.ToLower(args[2]) {
+	case "false":
+	case "true":
+		override = true
+	default:
+		cmd.Printf("override %s should be a boolean\n", args[2])
+		return
+	}
+	postJSON(cmd, ruleGroupPrefix, map[string]interface{}{
+		"id":       args[0],
+		"index":    index,
+		"override": override,
+	})
+}
+
+func deleteRuleGroupFunc(cmd *cobra.Command, args []string) {
+	if len(args) != 1 {
+		cmd.Println(cmd.UsageString())
+		return
+	}
+	_, err := doRequest(cmd, path.Join(ruleGroupPrefix, args[0]), http.MethodDelete)
+	if err != nil {
+		cmd.Printf("Failed to remove rule group config: %s \n", err)
+		return
 	}
 	cmd.Println("Success!")
 }
diff --git a/tools/pd-ctl/pdctl/command/exit_command.go b/tools/pd-ctl/pdctl/command/exit_command.go
index 23e0d5257ee..a728d0eae86 100644
--- a/tools/pd-ctl/pdctl/command/exit_command.go
+++ b/tools/pd-ctl/pdctl/command/exit_command.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-ctl/pdctl/command/gc_safepoint_command.go b/tools/pd-ctl/pdctl/command/gc_safepoint_command.go
new file mode 100644
index 00000000000..8600432baff
--- /dev/null
+++ b/tools/pd-ctl/pdctl/command/gc_safepoint_command.go
@@ -0,0 +1,70 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package command
+
+import (
+	"net/http"
+
+	"github.com/spf13/cobra"
+)
+
+var (
+	serviceGCSafepointPrefix = "pd/api/v1/gc/safepoint"
+)
+
+// NewServiceGCSafepointCommand return a service gc safepoint subcommand of rootCmd
+func NewServiceGCSafepointCommand() *cobra.Command {
+	l := &cobra.Command{
+		Use:   "service-gc-safepoint",
+		Short: "show all service gc safepoint",
+		Run:   showSSPs,
+	}
+	l.AddCommand(NewDeleteServiceGCSafepointCommand())
+	return l
+}
+
+// NewDeleteServiceGCSafepointCommand return a subcommand to delete service gc safepoint
+func NewDeleteServiceGCSafepointCommand() *cobra.Command {
+	l := &cobra.Command{
+		Use:    "delete <service ID>",
+		Short:  "delete a service gc safepoint",
+		Run:    deleteSSP,
+		Hidden: true,
+	}
+	return l
+}
+
+func showSSPs(cmd *cobra.Command, args []string) {
+	r, err := doRequest(cmd, serviceGCSafepointPrefix, http.MethodGet)
+	if err != nil {
+		cmd.Printf("Failed to get service GC safepoint: %s\n", err)
+		return
+	}
+	cmd.Println(r)
+}
+
+func deleteSSP(cmd *cobra.Command, args []string) {
+	if len(args) != 1 {
+		cmd.Usage()
+		return
+	}
+	serviceID := args[0]
+	deleteURL := serviceGCSafepointPrefix + "/" + serviceID
+	r, err := doRequest(cmd, deleteURL, http.MethodDelete)
+	if err != nil {
+		cmd.Printf("Failed to delete service GC safepoint: %s\n", err)
+		return
+	}
+	cmd.Println(r)
+}
diff --git a/tools/pd-ctl/pdctl/command/global.go b/tools/pd-ctl/pdctl/command/global.go
index a2074b25fff..6ee612697d4 100644
--- a/tools/pd-ctl/pdctl/command/global.go
+++ b/tools/pd-ctl/pdctl/command/global.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
 	"github.com/spf13/cobra"
 	"go.etcd.io/etcd/pkg/transport"
 )
diff --git a/tools/pd-ctl/pdctl/command/health_command.go b/tools/pd-ctl/pdctl/command/health_command.go
index 18234211c60..8b09ec74ab3 100644
--- a/tools/pd-ctl/pdctl/command/health_command.go
+++ b/tools/pd-ctl/pdctl/command/health_command.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-ctl/pdctl/command/hot_command.go b/tools/pd-ctl/pdctl/command/hot_command.go
index 47d5caf897f..ad0cd30502c 100644
--- a/tools/pd-ctl/pdctl/command/hot_command.go
+++ b/tools/pd-ctl/pdctl/command/hot_command.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-ctl/pdctl/command/label_command.go b/tools/pd-ctl/pdctl/command/label_command.go
index 84e7de3cd32..2947edeb153 100644
--- a/tools/pd-ctl/pdctl/command/label_command.go
+++ b/tools/pd-ctl/pdctl/command/label_command.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-ctl/pdctl/command/log_command.go b/tools/pd-ctl/pdctl/command/log_command.go
index 86e10b44cce..a311f442718 100644
--- a/tools/pd-ctl/pdctl/command/log_command.go
+++ b/tools/pd-ctl/pdctl/command/log_command.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-ctl/pdctl/command/member_command.go b/tools/pd-ctl/pdctl/command/member_command.go
index df0d2eb29de..54b8d69e3b7 100644
--- a/tools/pd-ctl/pdctl/command/member_command.go
+++ b/tools/pd-ctl/pdctl/command/member_command.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-ctl/pdctl/command/operator.go b/tools/pd-ctl/pdctl/command/operator.go
index 5729db8e913..84b6c8453b8 100644
--- a/tools/pd-ctl/pdctl/command/operator.go
+++ b/tools/pd-ctl/pdctl/command/operator.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
 	"github.com/spf13/cobra"
 )
 
diff --git a/tools/pd-ctl/pdctl/command/ping_command.go b/tools/pd-ctl/pdctl/command/ping_command.go
index d4c129b49e6..632baa62b4d 100644
--- a/tools/pd-ctl/pdctl/command/ping_command.go
+++ b/tools/pd-ctl/pdctl/command/ping_command.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-ctl/pdctl/command/plugin_command.go b/tools/pd-ctl/pdctl/command/plugin_command.go
index 24429d43cb0..e88ca9cd6c9 100644
--- a/tools/pd-ctl/pdctl/command/plugin_command.go
+++ b/tools/pd-ctl/pdctl/command/plugin_command.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/pingcap/pd/v4/server/cluster"
 	"github.com/spf13/cobra"
+	"github.com/tikv/pd/server/cluster"
 )
 
 var (
diff --git a/tools/pd-ctl/pdctl/command/region_command.go b/tools/pd-ctl/pdctl/command/region_command.go
index 45ed5117baf..a2f9062dac7 100644
--- a/tools/pd-ctl/pdctl/command/region_command.go
+++ b/tools/pd-ctl/pdctl/command/region_command.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )
diff --git a/tools/pd-ctl/pdctl/command/scheduler.go b/tools/pd-ctl/pdctl/command/scheduler.go
index 90269d413c3..5ca445a572d 100644
--- a/tools/pd-ctl/pdctl/command/scheduler.go
+++ b/tools/pd-ctl/pdctl/command/scheduler.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-ctl/pdctl/command/store_command.go b/tools/pd-ctl/pdctl/command/store_command.go
index 43a7dcb134e..3b3724778bd 100644
--- a/tools/pd-ctl/pdctl/command/store_command.go
+++ b/tools/pd-ctl/pdctl/command/store_command.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-ctl/pdctl/command/tso_command.go b/tools/pd-ctl/pdctl/command/tso_command.go
index d0edfd69e01..5eb86271d3b 100644
--- a/tools/pd-ctl/pdctl/command/tso_command.go
+++ b/tools/pd-ctl/pdctl/command/tso_command.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@ package command
 import (
 	"strconv"
 
-	"github.com/pingcap/pd/v4/pkg/tsoutil"
 	"github.com/spf13/cobra"
+	"github.com/tikv/pd/pkg/tsoutil"
 )
 
 // NewTSOCommand return a ping subcommand of rootCmd
diff --git a/tools/pd-ctl/pdctl/ctl.go b/tools/pd-ctl/pdctl/ctl.go
index 334479db7fe..18087ed6a67 100644
--- a/tools/pd-ctl/pdctl/ctl.go
+++ b/tools/pd-ctl/pdctl/ctl.go
@@ -1,4 +1,4 @@
-// Copyright 2016 PingCAP, Inc.
+// Copyright 2016 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,12 +17,13 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"strings"
 
 	"github.com/chzyer/readline"
 	"github.com/mattn/go-shellwords"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/tools/pd-ctl/pdctl/command"
 	"github.com/spf13/cobra"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/tools/pd-ctl/pdctl/command"
 )
 
 // CommandFlags are flags that used in all Commands
@@ -37,9 +38,10 @@ type CommandFlags struct {
 var (
 	commandFlags = CommandFlags{}
 
-	detach   bool
-	interact bool
-	version  bool
+	detach            bool
+	interact          bool
+	version           bool
+	readlineCompleter *readline.PrefixCompleter
 )
 
 func init() {
@@ -85,6 +87,7 @@ func getBasicCmd() *cobra.Command {
 		command.NewHealthCommand(),
 		command.NewLogCommand(),
 		command.NewPluginCommand(),
+		command.NewServiceGCSafepointCommand(),
 		command.NewCompletionCommand(),
 	)
 
@@ -117,6 +120,7 @@ func getMainCmd(args []string) *cobra.Command {
 	rootCmd.ParseFlags(args)
 	rootCmd.SetOutput(os.Stdout)
 
+	readlineCompleter = readline.NewPrefixCompleter(genCompleter(rootCmd)...)
 	return rootCmd
 }
 
@@ -156,6 +160,7 @@ func loop() {
 	l, err := readline.NewEx(&readline.Config{
 		Prompt:            "\033[31m»\033[0m ",
 		HistoryFile:       "/tmp/readline.tmp",
+		AutoComplete:      readlineCompleter,
 		InterruptPrompt:   "^C",
 		EOFPrompt:         "^D",
 		HistorySearchFold: true,
@@ -190,3 +195,22 @@ func loop() {
 		Start(args)
 	}
 }
+
+func genCompleter(cmd *cobra.Command) []readline.PrefixCompleterInterface {
+	pc := []readline.PrefixCompleterInterface{}
+
+	for _, v := range cmd.Commands() {
+		if v.HasFlags() {
+			flagsPc := []readline.PrefixCompleterInterface{}
+			flagUsages := strings.Split(strings.Trim(v.Flags().FlagUsages(), " "), "\n")
+			for i := 0; i < len(flagUsages)-1; i++ {
+				flagsPc = append(flagsPc, readline.PcItem(strings.Split(strings.Trim(flagUsages[i], " "), " ")[0]))
+			}
+			flagsPc = append(flagsPc, genCompleter(v)...)
+			pc = append(pc, readline.PcItem(strings.Split(v.Use, " ")[0], flagsPc...))
+		} else {
+			pc = append(pc, readline.PcItem(strings.Split(v.Use, " ")[0], genCompleter(v)...))
+		}
+	}
+	return pc
+}
diff --git a/tools/pd-ctl/pdctl/ctl_test.go b/tools/pd-ctl/pdctl/ctl_test.go
new file mode 100644
index 00000000000..caf6b8a7aa0
--- /dev/null
+++ b/tools/pd-ctl/pdctl/ctl_test.go
@@ -0,0 +1,70 @@
+// Copyright 2020 TiKV Project Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pdctl
+
+import (
+	"testing"
+
+	"github.com/spf13/cobra"
+)
+
+func newCommand(usage, short string) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   usage,
+		Short: short,
+	}
+	return cmd
+}
+
+func TestGenCompleter(t *testing.T) {
+	var subCommand = []string{"testa", "testb", "testc", "testdef"}
+
+	rootCmd := &cobra.Command{
+		Use:   "roottest",
+		Short: "test root cmd",
+	}
+
+	cmdA := newCommand("testa", "test a command")
+	cmdB := newCommand("testb", "test b command")
+	cmdC := newCommand("testc", "test c command")
+	cmdDEF := newCommand("testdef", "test def command")
+
+	rootCmd.AddCommand(cmdA, cmdB, cmdC, cmdDEF)
+
+	pc := genCompleter(rootCmd)
+
+	for _, cmd := range subCommand {
+		runArray := []rune(cmd)
+		inPrefixArray := true
+		for _, v := range pc {
+			inPrefixArray = true
+			if len(runArray) != len(v.GetName())-1 {
+				continue
+			}
+			for i := 0; i < len(runArray); i++ {
+				if runArray[i] != v.GetName()[i] {
+					inPrefixArray = false
+				}
+			}
+			if inPrefixArray == true {
+				break
+			}
+		}
+
+		if inPrefixArray == false {
+			t.Errorf("%s not in prefix array", cmd)
+		}
+	}
+
+}
diff --git a/tools/pd-heartbeat-bench/main.go b/tools/pd-heartbeat-bench/main.go
index 4f1515b50aa..fe2fa5b793b 100644
--- a/tools/pd-heartbeat-bench/main.go
+++ b/tools/pd-heartbeat-bench/main.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-recover/README.md b/tools/pd-recover/README.md
index 2b0f02127fb..a229c5726fa 100644
--- a/tools/pd-recover/README.md
+++ b/tools/pd-recover/README.md
@@ -5,7 +5,7 @@
 ## Build
 
 1. [Go](https://golang.org/) Version 1.13 or later
-2. In the root directory of the [PD project](https://github.com/pingcap/pd), use the `make pd-recover` command to compile and generate `bin/pd-recover`.
+2. In the root directory of the [PD project](https://github.com/tikv/pd), use the `make pd-recover` command to compile and generate `bin/pd-recover`.
 
 ## Usage
 
diff --git a/tools/pd-recover/main.go b/tools/pd-recover/main.go
index c9f80cec5eb..8fd3a989b96 100644
--- a/tools/pd-recover/main.go
+++ b/tools/pd-recover/main.go
@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/pkg/transport"
 )
diff --git a/tools/pd-simulator/README.md b/tools/pd-simulator/README.md
index 0df2ab06c97..58c0662e116 100644
--- a/tools/pd-simulator/README.md
+++ b/tools/pd-simulator/README.md
@@ -5,7 +5,7 @@ pd-simulator is a tool to reproduce some scenarios and evaluate the schedulers'
 
 ## Build
 1. [Go](https://golang.org/) Version 1.9 or later
-2. In the root directory of the [PD project](https://github.com/pingcap/pd), use the `make simulator` command to compile and generate `bin/pd-simulator`
+2. In the root directory of the [PD project](https://github.com/tikv/pd), use the `make simulator` command to compile and generate `bin/pd-simulator`
 
 
 ## Usage
diff --git a/tools/pd-simulator/main.go b/tools/pd-simulator/main.go
index 6b5d8558565..c4e15d0c05c 100644
--- a/tools/pd-simulator/main.go
+++ b/tools/pd-simulator/main.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,19 +24,19 @@ import (
 
 	"github.com/BurntSushi/toml"
 	"github.com/pingcap/log"
-	"github.com/pingcap/pd/v4/pkg/logutil"
-	"github.com/pingcap/pd/v4/server"
-	"github.com/pingcap/pd/v4/server/api"
-	"github.com/pingcap/pd/v4/server/config"
-	"github.com/pingcap/pd/v4/server/statistics"
-	"github.com/pingcap/pd/v4/tools/pd-analysis/analysis"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/cases"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/pkg/logutil"
+	"github.com/tikv/pd/server"
+	"github.com/tikv/pd/server/api"
+	"github.com/tikv/pd/server/config"
+	"github.com/tikv/pd/server/statistics"
+	"github.com/tikv/pd/tools/pd-analysis/analysis"
+	"github.com/tikv/pd/tools/pd-simulator/simulator"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/cases"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 	"go.uber.org/zap"
 
 	// Register schedulers.
-	_ "github.com/pingcap/pd/v4/server/schedulers"
+	_ "github.com/tikv/pd/server/schedulers"
 )
 
 var (
diff --git a/tools/pd-simulator/simulator/cases/add_nodes.go b/tools/pd-simulator/simulator/cases/add_nodes.go
index 0952a0c6f7d..6b9d4c3031c 100644
--- a/tools/pd-simulator/simulator/cases/add_nodes.go
+++ b/tools/pd-simulator/simulator/cases/add_nodes.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@ import (
 	"math/rand"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/info"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/info"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 	"go.uber.org/zap"
 )
 
diff --git a/tools/pd-simulator/simulator/cases/add_nodes_dynamic.go b/tools/pd-simulator/simulator/cases/add_nodes_dynamic.go
index bfd32aaace7..97bcc4e6dc1 100644
--- a/tools/pd-simulator/simulator/cases/add_nodes_dynamic.go
+++ b/tools/pd-simulator/simulator/cases/add_nodes_dynamic.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@ import (
 	"math/rand"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/info"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/info"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 	"go.uber.org/zap"
 )
 
diff --git a/tools/pd-simulator/simulator/cases/balance_leader.go b/tools/pd-simulator/simulator/cases/balance_leader.go
index 31f6471572f..52334dd061e 100644
--- a/tools/pd-simulator/simulator/cases/balance_leader.go
+++ b/tools/pd-simulator/simulator/cases/balance_leader.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@ package cases
 
 import (
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/info"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/info"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 	"go.uber.org/zap"
 )
 
diff --git a/tools/pd-simulator/simulator/cases/cases.go b/tools/pd-simulator/simulator/cases/cases.go
index ad65a456695..1a394b902cc 100644
--- a/tools/pd-simulator/simulator/cases/cases.go
+++ b/tools/pd-simulator/simulator/cases/cases.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@ package cases
 
 import (
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/info"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/info"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 )
 
 // Store is used to simulate tikv.
diff --git a/tools/pd-simulator/simulator/cases/delete_nodes.go b/tools/pd-simulator/simulator/cases/delete_nodes.go
index 9e097b46fa4..32bf1023648 100644
--- a/tools/pd-simulator/simulator/cases/delete_nodes.go
+++ b/tools/pd-simulator/simulator/cases/delete_nodes.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@ import (
 	"math/rand"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/info"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/info"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 	"go.uber.org/zap"
 )
 
diff --git a/tools/pd-simulator/simulator/cases/event_inner.go b/tools/pd-simulator/simulator/cases/event_inner.go
index 682dbbd829c..6d1642fc722 100644
--- a/tools/pd-simulator/simulator/cases/event_inner.go
+++ b/tools/pd-simulator/simulator/cases/event_inner.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-simulator/simulator/cases/hot_read.go b/tools/pd-simulator/simulator/cases/hot_read.go
index 82a3ccd4164..7bd634e4280 100644
--- a/tools/pd-simulator/simulator/cases/hot_read.go
+++ b/tools/pd-simulator/simulator/cases/hot_read.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@ import (
 	"math/rand"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/info"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/info"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 	"go.uber.org/zap"
 )
 
diff --git a/tools/pd-simulator/simulator/cases/hot_write.go b/tools/pd-simulator/simulator/cases/hot_write.go
index 0a7f1961f84..94953e067dc 100644
--- a/tools/pd-simulator/simulator/cases/hot_write.go
+++ b/tools/pd-simulator/simulator/cases/hot_write.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/info"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/info"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 )
 
 func newHotWrite() *Case {
diff --git a/tools/pd-simulator/simulator/cases/import_data.go b/tools/pd-simulator/simulator/cases/import_data.go
index 536e3a0b3fc..2475437f8b5 100644
--- a/tools/pd-simulator/simulator/cases/import_data.go
+++ b/tools/pd-simulator/simulator/cases/import_data.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/codec"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/info"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/pkg/codec"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/info"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 )
 
 func newImportData() *Case {
@@ -40,8 +40,8 @@ func newImportData() *Case {
 		})
 	}
 
-	storeIDs := rand.Perm(3)
-	for i := 0; i < 40; i++ {
+	for i := 0; i < getRegionNum(); i++ {
+		storeIDs := rand.Perm(10)
 		peers := []*metapb.Peer{
 			{Id: IDAllocator.nextID(), StoreId: uint64(storeIDs[0] + 1)},
 			{Id: IDAllocator.nextID(), StoreId: uint64(storeIDs[1] + 1)},
@@ -63,23 +63,18 @@ func newImportData() *Case {
 	e := &WriteFlowOnSpotDescriptor{}
 	table2 := string(codec.EncodeBytes(codec.GenerateTableKey(2)))
 	table3 := string(codec.EncodeBytes(codec.GenerateTableKey(3)))
-	table5 := string(codec.EncodeBytes(codec.GenerateTableKey(5)))
 	e.Step = func(tick int64) map[string]int64 {
-		if tick < 100 {
-			return map[string]int64{
-				table3: 4 * MB,
-				table5: 32 * MB,
-			}
+		if tick > int64(getRegionNum())/10 {
+			return nil
 		}
 		return map[string]int64{
-			table2: 2 * MB,
-			table3: 4 * MB,
-			table5: 16 * MB,
+			table2: 32 * MB,
 		}
 	}
 	simCase.Events = []EventDescriptor{e}
 
 	// Checker description
+	checkCount := uint64(0)
 	simCase.Checker = func(regions *core.RegionsInfo, stats []info.StoreStats) bool {
 		leaderDist := make(map[uint64]int)
 		peerDist := make(map[uint64]int)
@@ -120,14 +115,13 @@ func newImportData() *Case {
 		regionTotal := regions.GetRegionCount()
 		totalLeaderLog := fmt.Sprintf("%d leader:", regionTotal)
 		totalPeerLog := fmt.Sprintf("%d peer:", regionTotal*3)
-		isEnd := true
+		isEnd := false
+		var regionProps []float64
 		for storeID := uint64(1); storeID <= 10; storeID++ {
 			regions.GetStoreRegionCount(storeID)
 			totalLeaderLog = fmt.Sprintf("%s [store %d]:%.2f%%", totalLeaderLog, storeID, float64(regions.GetStoreLeaderCount(storeID))/float64(regionTotal)*100)
 			regionProp := float64(regions.GetStoreRegionCount(storeID)) / float64(regionTotal*3) * 100
-			if regionProp > 13.8 {
-				isEnd = false
-			}
+			regionProps = append(regionProps, regionProp)
 			totalPeerLog = fmt.Sprintf("%s [store %d]:%.2f%%", totalPeerLog, storeID, regionProp)
 		}
 		simutil.Logger.Info("import data information",
@@ -135,6 +129,17 @@ func newImportData() *Case {
 			zap.String("table-peer", tablePeerLog),
 			zap.String("total-leader", totalLeaderLog),
 			zap.String("total-peer", totalPeerLog))
+		checkCount++
+		dev := 0.0
+		for _, p := range regionProps {
+			dev += (p - 10) * (p - 10) / 100
+		}
+		if dev > 0.005 {
+			simutil.Logger.Warn("Not balanced, change scheduler or store limit", zap.Float64("dev score", dev))
+		}
+		if checkCount > uint64(getRegionNum())/10 {
+			isEnd = dev < 0.002
+		}
 		return isEnd
 	}
 	return &simCase
diff --git a/tools/pd-simulator/simulator/cases/makeup_down_replica.go b/tools/pd-simulator/simulator/cases/makeup_down_replica.go
index db31dc0d35a..cf8a62adfbc 100644
--- a/tools/pd-simulator/simulator/cases/makeup_down_replica.go
+++ b/tools/pd-simulator/simulator/cases/makeup_down_replica.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@ package cases
 
 import (
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/info"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/info"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 	"go.uber.org/zap"
 )
 
diff --git a/tools/pd-simulator/simulator/cases/redundant_balance_region.go b/tools/pd-simulator/simulator/cases/redundant_balance_region.go
index a517bfbde15..ce65ee2de28 100644
--- a/tools/pd-simulator/simulator/cases/redundant_balance_region.go
+++ b/tools/pd-simulator/simulator/cases/redundant_balance_region.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@ import (
 	"time"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/info"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/info"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 	"go.uber.org/zap"
 )
 
diff --git a/tools/pd-simulator/simulator/cases/region_merge.go b/tools/pd-simulator/simulator/cases/region_merge.go
index 9dff5ce0a58..071c35e33a1 100644
--- a/tools/pd-simulator/simulator/cases/region_merge.go
+++ b/tools/pd-simulator/simulator/cases/region_merge.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@ import (
 	"math/rand"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/info"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/info"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 	"go.uber.org/zap"
 )
 
diff --git a/tools/pd-simulator/simulator/cases/region_split.go b/tools/pd-simulator/simulator/cases/region_split.go
index f9cec2a6f27..730ae84ade3 100644
--- a/tools/pd-simulator/simulator/cases/region_split.go
+++ b/tools/pd-simulator/simulator/cases/region_split.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@ package cases
 
 import (
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/info"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/info"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 	"go.uber.org/zap"
 )
 
diff --git a/tools/pd-simulator/simulator/client.go b/tools/pd-simulator/simulator/client.go
index 4eab984f074..39fc3f4746d 100644
--- a/tools/pd-simulator/simulator/client.go
+++ b/tools/pd-simulator/simulator/client.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,13 +19,12 @@ import (
 	"sync"
 	"time"
 
-	"go.uber.org/zap"
-
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
+	"go.uber.org/zap"
 	"google.golang.org/grpc"
 )
 
diff --git a/tools/pd-simulator/simulator/config.go b/tools/pd-simulator/simulator/config.go
index 311a68d76a7..80cb591e42f 100644
--- a/tools/pd-simulator/simulator/config.go
+++ b/tools/pd-simulator/simulator/config.go
@@ -5,9 +5,9 @@ import (
 	"io/ioutil"
 	"time"
 
-	"github.com/pingcap/pd/v4/pkg/tempurl"
-	"github.com/pingcap/pd/v4/pkg/typeutil"
-	"github.com/pingcap/pd/v4/server/config"
+	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/server/config"
 )
 
 const (
diff --git a/tools/pd-simulator/simulator/conn.go b/tools/pd-simulator/simulator/conn.go
index a717cf5be8f..fd2524a0c47 100644
--- a/tools/pd-simulator/simulator/conn.go
+++ b/tools/pd-simulator/simulator/conn.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@ package simulator
 
 import (
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/cases"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/cases"
 )
 
 // Connection records the informations of connection among nodes.
diff --git a/tools/pd-simulator/simulator/drive.go b/tools/pd-simulator/simulator/drive.go
index 0167c596a7c..269dc1eb83f 100644
--- a/tools/pd-simulator/simulator/drive.go
+++ b/tools/pd-simulator/simulator/drive.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,14 +17,13 @@ import (
 	"context"
 	"sync"
 
-	"go.uber.org/zap"
-
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/cases"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/info"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/cases"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/info"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
+	"go.uber.org/zap"
 )
 
 // Driver promotes the cluster status change.
diff --git a/tools/pd-simulator/simulator/event.go b/tools/pd-simulator/simulator/event.go
index ca2cff2d2aa..1b3a9a0dfd6 100644
--- a/tools/pd-simulator/simulator/event.go
+++ b/tools/pd-simulator/simulator/event.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@ package simulator
 import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/cases"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/cases"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 	"go.uber.org/zap"
 )
 
diff --git a/tools/pd-simulator/simulator/info/stats.go b/tools/pd-simulator/simulator/info/stats.go
index 2eb5dc8754c..474d868521c 100644
--- a/tools/pd-simulator/simulator/info/stats.go
+++ b/tools/pd-simulator/simulator/info/stats.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-simulator/simulator/node.go b/tools/pd-simulator/simulator/node.go
index 62ce0bcfa8b..ccd915d4a86 100644
--- a/tools/pd-simulator/simulator/node.go
+++ b/tools/pd-simulator/simulator/node.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/cases"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/info"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/cases"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/info"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 )
 
 const (
diff --git a/tools/pd-simulator/simulator/raft.go b/tools/pd-simulator/simulator/raft.go
index 581e5f8baba..9c97ba21a01 100644
--- a/tools/pd-simulator/simulator/raft.go
+++ b/tools/pd-simulator/simulator/raft.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@ import (
 	"context"
 	"sync"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/cases"
-	"github.com/pingcap/pd/v4/tools/pd-simulator/simulator/simutil"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/cases"
+	"github.com/tikv/pd/tools/pd-simulator/simulator/simutil"
 	"go.uber.org/zap"
 )
 
diff --git a/tools/pd-simulator/simulator/simutil/case_config.go b/tools/pd-simulator/simulator/simutil/case_config.go
index 23f387b19d3..37d881a7584 100644
--- a/tools/pd-simulator/simulator/simutil/case_config.go
+++ b/tools/pd-simulator/simulator/simutil/case_config.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-simulator/simulator/simutil/key.go b/tools/pd-simulator/simulator/simutil/key.go
index ed3f053af9c..d25c95230af 100644
--- a/tools/pd-simulator/simulator/simutil/key.go
+++ b/tools/pd-simulator/simulator/simutil/key.go
@@ -1,4 +1,4 @@
-// Copyright 2019 PingCAP, Inc.
+// Copyright 2019 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ import (
 	"math/rand"
 	"sort"
 
-	"github.com/pingcap/pd/v4/pkg/codec"
-	"github.com/pkg/errors"
+	"github.com/pingcap/errors"
+	"github.com/tikv/pd/pkg/codec"
 )
 
 const (
diff --git a/tools/pd-simulator/simulator/simutil/key_test.go b/tools/pd-simulator/simulator/simutil/key_test.go
index 47360b0d55c..ceb02f6ee17 100644
--- a/tools/pd-simulator/simulator/simutil/key_test.go
+++ b/tools/pd-simulator/simulator/simutil/key_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ import (
 	"testing"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/v4/pkg/codec"
+	"github.com/tikv/pd/pkg/codec"
 )
 
 func Test(t *testing.T) {
diff --git a/tools/pd-simulator/simulator/simutil/logger.go b/tools/pd-simulator/simulator/simutil/logger.go
index e4dd4ea93b7..f03412d97ed 100644
--- a/tools/pd-simulator/simulator/simutil/logger.go
+++ b/tools/pd-simulator/simulator/simutil/logger.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-simulator/simulator/statistics.go b/tools/pd-simulator/simulator/statistics.go
index c353197c748..7b28db38f6d 100644
--- a/tools/pd-simulator/simulator/statistics.go
+++ b/tools/pd-simulator/simulator/statistics.go
@@ -1,4 +1,4 @@
-// Copyright 2018 PingCAP, Inc.
+// Copyright 2018 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/pd-simulator/simulator/task.go b/tools/pd-simulator/simulator/task.go
index 35c5b443a79..0ffa3153e7e 100644
--- a/tools/pd-simulator/simulator/task.go
+++ b/tools/pd-simulator/simulator/task.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"github.com/pingcap/kvproto/pkg/eraftpb"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pingcap/pd/v4/tools/pd-analysis/analysis"
+	"github.com/tikv/pd/server/core"
+	"github.com/tikv/pd/tools/pd-analysis/analysis"
 )
 
 // Task running in node.
diff --git a/tools/pd-tso-bench/README.md b/tools/pd-tso-bench/README.md
index c997a1c0814..7b0322c9ce7 100644
--- a/tools/pd-tso-bench/README.md
+++ b/tools/pd-tso-bench/README.md
@@ -5,7 +5,7 @@ pd-tso-bench is a tool to benchmark GetTS performance.
 
 ## Build
 1. [Go](https://golang.org/) Version 1.9 or later
-2. In the root directory of the [PD project](https://github.com/pingcap/pd), use the `make` command to compile and generate `bin/pd-tso-bench`
+2. In the root directory of the [PD project](https://github.com/tikv/pd), use the `make` command to compile and generate `bin/pd-tso-bench`
 
 
 ## Usage
diff --git a/tools/pd-tso-bench/main.go b/tools/pd-tso-bench/main.go
index 294da40ebf2..be996fb44d9 100644
--- a/tools/pd-tso-bench/main.go
+++ b/tools/pd-tso-bench/main.go
@@ -1,4 +1,4 @@
-// Copyright 2017 PingCAP, Inc.
+// Copyright 2017 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,10 +26,10 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	pd "github.com/pingcap/pd/v4/client"
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+	pd "github.com/tikv/pd/client"
 	"go.uber.org/zap"
 )
 
diff --git a/tools/regions-dump/main.go b/tools/regions-dump/main.go
index 07ad9c67b85..48ed65e9dc8 100644
--- a/tools/regions-dump/main.go
+++ b/tools/regions-dump/main.go
@@ -11,10 +11,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pingcap/pd/v4/server/core"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/server/core"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/pkg/transport"
 )
diff --git a/tools/stores-dump/main.go b/tools/stores-dump/main.go
index 9f39a3d0119..19868440ee3 100644
--- a/tools/stores-dump/main.go
+++ b/tools/stores-dump/main.go
@@ -1,4 +1,4 @@
-// Copyright 2020 PingCAP, Inc.
+// Copyright 2020 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
-	"github.com/pingcap/pd/v4/pkg/etcdutil"
-	"github.com/pkg/errors"
+	"github.com/tikv/pd/pkg/etcdutil"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/pkg/transport"
 )