Bump to version 3.0.0

3 files changed, 18 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2d4d5eda4fc..093dff0e8481 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,25 @@
 pkgbase = tikv-pd
 	pkgdesc = Manage and schedule the TiKV cluster.
-	pkgver = 2.1.10
+	pkgver = 3.0.0
 	pkgrel = 1
 	url = https://github.com/pingcap/pd
 	arch = x86_64
 	license = Apache
 	makedepends = go
 	makedepends = make
+	makedepends = git
 	provides = pd-server
 	backup = etc/pd/pd.toml
-	source = pd-2.1.10.tar.gz::https://github.com/pingcap/pd/archive/v2.1.10.tar.gz
+	source = pd-3.0.0.tar.gz::https://github.com/pingcap/pd/archive/v3.0.0.tar.gz
 	source = pd.service
 	source = pd-sysusers.conf
 	source = pd-tmpfiles.conf
 	source = pd.toml
-	sha256sums = ec3460794dadf8a586a2ff9501b6902f691735620f5a8d3c7e4a421be82ad681
+	sha256sums = 090f3876a45165441d11fa54958beed89f88b3818ef0144ff374685801e9bff0
 	sha256sums = b03d12f2f8d6eb2e9d654d6258ca39000225cdf1418840f7e35081631bc4d924
 	sha256sums = 5edd250ba9e70a4f8d27581ed658f0fbfeca58ca62429dec12bb5fffc0919b67
 	sha256sums = 15633aaa2d7726375112a1b5af88105878f09c176a542cde6d0e5f0c4eee4495
-	sha256sums = 11bc441dfd0327c56218f214a9869da20ccdf7e5265c2f5ffca45089ba8094db
+	sha256sums = dd3097d7f72da151d792894d2f3bb4188bfe9d445df8955d0f6f9b5c36980249
 
 pkgname = tikv-pd
 
diff --git a/PKGBUILD b/PKGBUILD
index 4236a186561b..57dcc2a7840c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Xuanwo <xuanwo@archlinuxcn.org>
 pkgname=tikv-pd
-pkgver=2.1.10
+pkgver=3.0.0
 pkgrel=1
 pkgdesc='Manage and schedule the TiKV cluster.'
-makedepends=('go' 'make')
+makedepends=('go' 'make' 'git')
 arch=('x86_64')
 url='https://github.com/pingcap/pd'
 license=('Apache')
@@ -14,11 +14,11 @@ source=(pd-${pkgver}.tar.gz::https://github.com/pingcap/pd/archive/v${pkgver}.ta
         pd-sysusers.conf
         pd-tmpfiles.conf
         pd.toml)
-sha256sums=('ec3460794dadf8a586a2ff9501b6902f691735620f5a8d3c7e4a421be82ad681'
+sha256sums=('090f3876a45165441d11fa54958beed89f88b3818ef0144ff374685801e9bff0'
             'b03d12f2f8d6eb2e9d654d6258ca39000225cdf1418840f7e35081631bc4d924'
             '5edd250ba9e70a4f8d27581ed658f0fbfeca58ca62429dec12bb5fffc0919b67'
             '15633aaa2d7726375112a1b5af88105878f09c176a542cde6d0e5f0c4eee4495'
-            '11bc441dfd0327c56218f214a9869da20ccdf7e5265c2f5ffca45089ba8094db')
+            'dd3097d7f72da151d792894d2f3bb4188bfe9d445df8955d0f6f9b5c36980249')
 
 _gopkgname='github.com/pingcap/pd'
 
diff --git a/pd.toml b/pd.toml
index 808f40ede708..a0a616d7e686 100644
--- a/pd.toml
+++ b/pd.toml
@@ -57,17 +57,19 @@ interval = "15s"
 address = ""
 
 [schedule]
-max-merge-region-size = 0
-max-merge-region-keys = 0
+max-merge-region-size = 20
+max-merge-region-keys = 200000
 split-merge-interval = "1h"
 max-snapshot-count = 3
 max-pending-peer-count = 16
 max-store-down-time = "30m"
 leader-schedule-limit = 4
-region-schedule-limit = 4
-replica-schedule-limit = 8
+region-schedule-limit = 64
+replica-schedule-limit = 64
 merge-schedule-limit = 8
-tolerant-size-ratio = 5.0
+hot-region-schedule-limit = 4
+#tolerant-size-ratio = 0.0
+#enable-one-way-merge = false
 
 # customized schedulers, the format is as below
 # if empty, it will use balance-leader, balance-region, hot-region as default
@@ -83,6 +85,8 @@ max-replicas = 3
 # For example, ["zone", "rack"] means that we should place replicas to
 # different zones first, then to different racks if we don't have enough zones.
 location-labels = []
+# Strictly checks if the label of TiKV is matched with location labels.
+#strictly-match-label = false
 
 [label-property]
 # Do not assign region leaders to stores that have these tags.