Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

checker: unify checker name and checker type #8316

Closed
wants to merge 23 commits into from
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions pkg/schedule/checker/joint_state_checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/tikv/pd/pkg/core"
"github.com/tikv/pd/pkg/core/constant"
"github.com/tikv/pd/pkg/errs"
"github.com/tikv/pd/pkg/schedule/config"
sche "github.com/tikv/pd/pkg/schedule/core"
"github.com/tikv/pd/pkg/schedule/operator"
)
Expand All @@ -29,15 +30,13 @@ type JointStateChecker struct {
cluster sche.CheckerCluster
}

const jointStateCheckerName = "joint_state_checker"

var (
// WithLabelValues is a heavy operation, define variable to avoid call it every time.
jointCheckCounter = checkerCounter.WithLabelValues(jointStateCheckerName, "check")
jointCheckerPausedCounter = checkerCounter.WithLabelValues(jointStateCheckerName, "paused")
jointCheckerFailedCounter = checkerCounter.WithLabelValues(jointStateCheckerName, "create-operator-fail")
jointCheckerNewOpCounter = checkerCounter.WithLabelValues(jointStateCheckerName, "new-operator")
jointCheckerTransferLeaderCounter = checkerCounter.WithLabelValues(jointStateCheckerName, "transfer-leader")
jointCheckCounter = counterWithEvent(config.JointStateCheckerName, "check")
jointCheckerPausedCounter = counterWithEvent(config.JointStateCheckerName, "paused")
jointCheckerFailedCounter = counterWithEvent(config.JointStateCheckerName, "create-operator-fail")
jointCheckerNewOpCounter = counterWithEvent(config.JointStateCheckerName, "new-operator")
jointCheckerTransferLeaderCounter = counterWithEvent(config.JointStateCheckerName, "transfer-leader")
)

// NewJointStateChecker creates a joint state checker.
Expand Down
3 changes: 2 additions & 1 deletion pkg/schedule/checker/learner_checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/pingcap/log"
"github.com/tikv/pd/pkg/core"
"github.com/tikv/pd/pkg/errs"
"github.com/tikv/pd/pkg/schedule/config"
sche "github.com/tikv/pd/pkg/schedule/core"
"github.com/tikv/pd/pkg/schedule/operator"
)
Expand All @@ -30,7 +31,7 @@ type LearnerChecker struct {

var (
// WithLabelValues is a heavy operation, define variable to avoid call it every time.
learnerCheckerPausedCounter = checkerCounter.WithLabelValues("learner_checker", "paused")
learnerCheckerPausedCounter = counterWithEvent(config.LearnerCheckerName, "paused")
)

// NewLearnerChecker creates a learner checker.
Expand Down
47 changes: 23 additions & 24 deletions pkg/schedule/checker/merge_checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,35 +42,34 @@ const (
// When a region has label `merge_option=deny`, skip merging the region.
// If label value is `allow` or other value, it will be treated as `allow`.
const (
mergeCheckerName = "merge_checker"
mergeOptionLabel = "merge_option"
mergeOptionValueDeny = "deny"
)

var (
// WithLabelValues is a heavy operation, define variable to avoid call it every time.
mergeCheckerCounter = checkerCounter.WithLabelValues(mergeCheckerName, "check")
mergeCheckerPausedCounter = checkerCounter.WithLabelValues(mergeCheckerName, "paused")
mergeCheckerRecentlySplitCounter = checkerCounter.WithLabelValues(mergeCheckerName, "recently-split")
mergeCheckerRecentlyStartCounter = checkerCounter.WithLabelValues(mergeCheckerName, "recently-start")
mergeCheckerNoLeaderCounter = checkerCounter.WithLabelValues(mergeCheckerName, "no-leader")
mergeCheckerNoNeedCounter = checkerCounter.WithLabelValues(mergeCheckerName, "no-need")
mergeCheckerUnhealthyRegionCounter = checkerCounter.WithLabelValues(mergeCheckerName, "unhealthy-region")
mergeCheckerAbnormalReplicaCounter = checkerCounter.WithLabelValues(mergeCheckerName, "abnormal-replica")
mergeCheckerHotRegionCounter = checkerCounter.WithLabelValues(mergeCheckerName, "hot-region")
mergeCheckerNoTargetCounter = checkerCounter.WithLabelValues(mergeCheckerName, "no-target")
mergeCheckerTargetTooLargeCounter = checkerCounter.WithLabelValues(mergeCheckerName, "target-too-large")
mergeCheckerSplitSizeAfterMergeCounter = checkerCounter.WithLabelValues(mergeCheckerName, "split-size-after-merge")
mergeCheckerSplitKeysAfterMergeCounter = checkerCounter.WithLabelValues(mergeCheckerName, "split-keys-after-merge")
mergeCheckerNewOpCounter = checkerCounter.WithLabelValues(mergeCheckerName, "new-operator")
mergeCheckerLargerSourceCounter = checkerCounter.WithLabelValues(mergeCheckerName, "larger-source")
mergeCheckerAdjNotExistCounter = checkerCounter.WithLabelValues(mergeCheckerName, "adj-not-exist")
mergeCheckerAdjRecentlySplitCounter = checkerCounter.WithLabelValues(mergeCheckerName, "adj-recently-split")
mergeCheckerAdjRegionHotCounter = checkerCounter.WithLabelValues(mergeCheckerName, "adj-region-hot")
mergeCheckerAdjDisallowMergeCounter = checkerCounter.WithLabelValues(mergeCheckerName, "adj-disallow-merge")
mergeCheckerAdjAbnormalPeerStoreCounter = checkerCounter.WithLabelValues(mergeCheckerName, "adj-abnormal-peerstore")
mergeCheckerAdjSpecialPeerCounter = checkerCounter.WithLabelValues(mergeCheckerName, "adj-special-peer")
mergeCheckerAdjAbnormalReplicaCounter = checkerCounter.WithLabelValues(mergeCheckerName, "adj-abnormal-replica")
mergeCheckerCounter = counterWithEvent(config.MergeCheckerName, "check")
mergeCheckerPausedCounter = counterWithEvent(config.MergeCheckerName, "paused")
mergeCheckerRecentlySplitCounter = counterWithEvent(config.MergeCheckerName, "recently-split")
mergeCheckerRecentlyStartCounter = counterWithEvent(config.MergeCheckerName, "recently-start")
mergeCheckerNoLeaderCounter = counterWithEvent(config.MergeCheckerName, "no-leader")
mergeCheckerNoNeedCounter = counterWithEvent(config.MergeCheckerName, "no-need")
mergeCheckerUnhealthyRegionCounter = counterWithEvent(config.MergeCheckerName, "unhealthy-region")
mergeCheckerAbnormalReplicaCounter = counterWithEvent(config.MergeCheckerName, "abnormal-replica")
mergeCheckerHotRegionCounter = counterWithEvent(config.MergeCheckerName, "hot-region")
mergeCheckerNoTargetCounter = counterWithEvent(config.MergeCheckerName, "no-target")
mergeCheckerTargetTooLargeCounter = counterWithEvent(config.MergeCheckerName, "target-too-large")
mergeCheckerSplitSizeAfterMergeCounter = counterWithEvent(config.MergeCheckerName, "split-size-after-merge")
mergeCheckerSplitKeysAfterMergeCounter = counterWithEvent(config.MergeCheckerName, "split-keys-after-merge")
mergeCheckerNewOpCounter = counterWithEvent(config.MergeCheckerName, "new-operator")
mergeCheckerLargerSourceCounter = counterWithEvent(config.MergeCheckerName, "larger-source")
mergeCheckerAdjNotExistCounter = counterWithEvent(config.MergeCheckerName, "adj-not-exist")
mergeCheckerAdjRecentlySplitCounter = counterWithEvent(config.MergeCheckerName, "adj-recently-split")
mergeCheckerAdjRegionHotCounter = counterWithEvent(config.MergeCheckerName, "adj-region-hot")
mergeCheckerAdjDisallowMergeCounter = counterWithEvent(config.MergeCheckerName, "adj-disallow-merge")
mergeCheckerAdjAbnormalPeerStoreCounter = counterWithEvent(config.MergeCheckerName, "adj-abnormal-peerstore")
mergeCheckerAdjSpecialPeerCounter = counterWithEvent(config.MergeCheckerName, "adj-special-peer")
mergeCheckerAdjAbnormalReplicaCounter = counterWithEvent(config.MergeCheckerName, "adj-abnormal-replica")
)

// MergeChecker ensures region to merge with adjacent region when size is small
Expand All @@ -95,7 +94,7 @@ func NewMergeChecker(ctx context.Context, cluster sche.CheckerCluster, conf conf

// GetType return MergeChecker's type
func (*MergeChecker) GetType() string {
return "merge-checker"
return config.MergeCheckerName.String()
}

// RecordRegionSplit put the recently split region into cache. MergeChecker
Expand Down
9 changes: 8 additions & 1 deletion pkg/schedule/checker/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@

package checker

import "github.com/prometheus/client_golang/prometheus"
import (
"github.com/prometheus/client_golang/prometheus"
"github.com/tikv/pd/pkg/schedule/config"
)

var (
checkerCounter = prometheus.NewCounterVec(
Expand All @@ -29,3 +32,7 @@ var (
func init() {
prometheus.MustRegister(checkerCounter)
}

func counterWithEvent(checker config.CheckerSchedulerName, event string) prometheus.Counter {
return checkerCounter.WithLabelValues(checker.String(), event)
}
38 changes: 18 additions & 20 deletions pkg/schedule/checker/replica_checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,26 @@ import (
)

const (
replicaCheckerName = "replica-checker"
replicaChecker = "replica_checker"
offlineStatus = "offline"
downStatus = "down"
offlineStatus = "offline"
downStatus = "down"
)

var (
// WithLabelValues is a heavy operation, define variable to avoid call it every time.
replicaCheckerCounter = checkerCounter.WithLabelValues(replicaChecker, "check")
replicaCheckerPausedCounter = checkerCounter.WithLabelValues(replicaChecker, "paused")
replicaCheckerNewOpCounter = checkerCounter.WithLabelValues(replicaChecker, "new-operator")
replicaCheckerNoTargetStoreCounter = checkerCounter.WithLabelValues(replicaChecker, "no-target-store")
replicaCheckerNoWorstPeerCounter = checkerCounter.WithLabelValues(replicaChecker, "no-worst-peer")
replicaCheckerCreateOpFailedCounter = checkerCounter.WithLabelValues(replicaChecker, "create-operator-failed")
replicaCheckerAllRightCounter = checkerCounter.WithLabelValues(replicaChecker, "all-right")
replicaCheckerNotBetterCounter = checkerCounter.WithLabelValues(replicaChecker, "not-better")
replicaCheckerRemoveExtraOfflineFailedCounter = checkerCounter.WithLabelValues(replicaChecker, "remove-extra-offline-replica-failed")
replicaCheckerRemoveExtraDownFailedCounter = checkerCounter.WithLabelValues(replicaChecker, "remove-extra-down-replica-failed")
replicaCheckerNoStoreOfflineCounter = checkerCounter.WithLabelValues(replicaChecker, "no-store-offline")
replicaCheckerNoStoreDownCounter = checkerCounter.WithLabelValues(replicaChecker, "no-store-down")
replicaCheckerReplaceOfflineFailedCounter = checkerCounter.WithLabelValues(replicaChecker, "replace-offline-replica-failed")
replicaCheckerReplaceDownFailedCounter = checkerCounter.WithLabelValues(replicaChecker, "replace-down-replica-failed")
replicaCheckerCounter = counterWithEvent(config.ReplicaCheckerName, "check")
replicaCheckerPausedCounter = counterWithEvent(config.ReplicaCheckerName, "paused")
replicaCheckerNewOpCounter = counterWithEvent(config.ReplicaCheckerName, "new-operator")
replicaCheckerNoTargetStoreCounter = counterWithEvent(config.ReplicaCheckerName, "no-target-store")
replicaCheckerNoWorstPeerCounter = counterWithEvent(config.ReplicaCheckerName, "no-worst-peer")
replicaCheckerCreateOpFailedCounter = counterWithEvent(config.ReplicaCheckerName, "create-operator-failed")
replicaCheckerAllRightCounter = counterWithEvent(config.ReplicaCheckerName, "all-right")
replicaCheckerNotBetterCounter = counterWithEvent(config.ReplicaCheckerName, "not-better")
replicaCheckerRemoveExtraOfflineFailedCounter = counterWithEvent(config.ReplicaCheckerName, "remove-extra-offline-replica-failed")
replicaCheckerRemoveExtraDownFailedCounter = counterWithEvent(config.ReplicaCheckerName, "remove-extra-down-replica-failed")
replicaCheckerNoStoreOfflineCounter = counterWithEvent(config.ReplicaCheckerName, "no-store-offline")
replicaCheckerNoStoreDownCounter = counterWithEvent(config.ReplicaCheckerName, "no-store-down")
replicaCheckerReplaceOfflineFailedCounter = counterWithEvent(config.ReplicaCheckerName, "replace-offline-replica-failed")
replicaCheckerReplaceDownFailedCounter = counterWithEvent(config.ReplicaCheckerName, "replace-down-replica-failed")
)

// ReplicaChecker ensures region has the best replicas.
Expand All @@ -77,7 +75,7 @@ func NewReplicaChecker(cluster sche.CheckerCluster, conf config.CheckerConfigPro

// GetType return ReplicaChecker's type
func (*ReplicaChecker) GetType() string {
return replicaCheckerName
return config.ReplicaCheckerName.String()
}

// Check verifies a region's replicas, creating an operator.Operator if need.
Expand Down Expand Up @@ -291,7 +289,7 @@ func (r *ReplicaChecker) fixPeer(region *core.RegionInfo, storeID uint64, status

func (r *ReplicaChecker) strategy(region *core.RegionInfo) *ReplicaStrategy {
return &ReplicaStrategy{
checkerName: replicaCheckerName,
checkerName: config.ReplicaCheckerName.String(),
cluster: r.cluster,
locationLabels: r.conf.GetLocationLabels(),
isolationLevel: r.conf.GetIsolationLevel(),
Expand Down
2 changes: 1 addition & 1 deletion pkg/schedule/checker/replica_strategy.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
// ReplicaStrategy collects some utilities to manipulate region peers. It
// exists to allow replica_checker and rule_checker to reuse common logics.
type ReplicaStrategy struct {
checkerName string // replica-checker / rule-checker
checkerName string // replica_checker / rule_checker
cluster sche.CheckerCluster
locationLabels []string
isolationLevel string
Expand Down
Loading
Loading