cluster: refine IsFeatureSupported (tikv#2889)

Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
HunDunDM · Sep 3, 2020 · 11d9a60 · 11d9a60
1 parent 5893584
commit 11d9a60
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/pkg/mock/mockcluster/mockcluster.go b/pkg/mock/mockcluster/mockcluster.go
@@ -40,22 +40,24 @@ type Cluster struct {
 	*placement.RuleManager
 	*statistics.HotCache
 	*statistics.StoresStats
-	ID             uint64
-	suspectRegions map[uint64]struct{}
+	ID               uint64
+	suspectRegions   map[uint64]struct{}
+	disabledFeatures map[versioninfo.Feature]struct{}
 }
 
 // NewCluster creates a new Cluster
 func NewCluster(opt *mockoption.ScheduleOptions) *Cluster {
 	ruleManager := placement.NewRuleManager(core.NewStorage(kv.NewMemoryKV()))
 	ruleManager.Initialize(opt.MaxReplicas, opt.GetLocationLabels())
 	return &Cluster{
-		BasicCluster:    core.NewBasicCluster(),
-		IDAllocator:     mockid.NewIDAllocator(),
-		ScheduleOptions: opt,
-		RuleManager:     ruleManager,
-		HotCache:        statistics.NewHotCache(),
-		StoresStats:     statistics.NewStoresStats(),
-		suspectRegions:  map[uint64]struct{}{},
+		BasicCluster:     core.NewBasicCluster(),
+		IDAllocator:      mockid.NewIDAllocator(),
+		ScheduleOptions:  opt,
+		RuleManager:      ruleManager,
+		HotCache:         statistics.NewHotCache(),
+		StoresStats:      statistics.NewStoresStats(),
+		suspectRegions:   make(map[uint64]struct{}),
+		disabledFeatures: make(map[versioninfo.Feature]struct{}),
 	}
 }
 
@@ -637,9 +639,17 @@ func (mc *Cluster) SetStoreLabel(storeID uint64, labels map[string]string) {
 	mc.PutStore(newStore)
 }
 
+// DisableFeature marks that these features are not supported in the cluster.
+func (mc *Cluster) DisableFeature(fs ...versioninfo.Feature) {
+	for _, f := range fs {
+		mc.disabledFeatures[f] = struct{}{}
+	}
+}
+
 // IsFeatureSupported checks if the feature is supported by current cluster.
-func (mc *Cluster) IsFeatureSupported(versioninfo.Feature) bool {
-	return true
+func (mc *Cluster) IsFeatureSupported(f versioninfo.Feature) bool {
+	_, ok := mc.disabledFeatures[f]
+	return !ok
 }
 
 // AddSuspectRegions mock method

diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -1334,8 +1334,6 @@ func (c *RaftCluster) changedRegionNotifier() <-chan *core.RegionInfo {
 
 // IsFeatureSupported checks if the feature is supported by current cluster.
 func (c *RaftCluster) IsFeatureSupported(f versioninfo.Feature) bool {
-	c.RLock()
-	defer c.RUnlock()
 	clusterVersion := *c.opt.GetClusterVersion()
 	minSupportVersion := *versioninfo.MinSupportedVersion(f)
 	// For features before version 5.0 (such as BatchSplit), strict version checks are performed according to the