Merge branch 'master' into sche-redirect10

Makefile

@@ -15,6 +15,8 @@ dev-basic: build check basic-test
 BUILD_FLAGS ?=
 BUILD_TAGS ?=
 BUILD_CGO_ENABLED := 0
+BUILD_TOOL_CGO_ENABLED := 0
+BUILD_GOEXPERIMENT ?=
 PD_EDITION ?= Community
 # Ensure PD_EDITION is set to Community or Enterprise before running build process.
 ifneq "$(PD_EDITION)" "Community"
@@ -46,6 +48,13 @@ ifeq ($(PLUGIN), 1)
  BUILD_TAGS += with_plugin
 endif
 
+ifeq ($(ENABLE_FIPS), 1)
+ BUILD_TAGS+=boringcrypto
+ BUILD_GOEXPERIMENT=boringcrypto
+ BUILD_CGO_ENABLED := 1
+ BUILD_TOOL_CGO_ENABLED := 1
+endif
+
 LDFLAGS += -X "$(PD_PKG)/pkg/versioninfo.PDReleaseVersion=$(shell git describe --tags --dirty --always)"
 LDFLAGS += -X "$(PD_PKG)/pkg/versioninfo.PDBuildTS=$(shell date -u '+%Y-%m-%d %I:%M:%S')"
 LDFLAGS += -X "$(PD_PKG)/pkg/versioninfo.PDGitHash=$(shell git rev-parse HEAD)"
@@ -79,7 +88,7 @@ endif
 PD_SERVER_DEP += dashboard-ui
 
 pd-server: ${PD_SERVER_DEP}
- 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
+ GOEXPERIMENT=$(BUILD_GOEXPERIMENT) 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-failpoint:
  @$(FAILPOINT_ENABLE)
@@ -94,13 +103,13 @@ pd-server-basic:
 # Tools
 
 pd-ctl:
- CGO_ENABLED=0 go build -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -o $(BUILD_BIN_PATH)/pd-ctl tools/pd-ctl/main.go
+ GOEXPERIMENT=$(BUILD_GOEXPERIMENT) CGO_ENABLED=$(BUILD_TOOL_CGO_ENABLED) go build -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -o $(BUILD_BIN_PATH)/pd-ctl tools/pd-ctl/main.go
 pd-tso-bench:
  cd tools/pd-tso-bench && CGO_ENABLED=0 go build -o $(BUILD_BIN_PATH)/pd-tso-bench main.go
 pd-api-bench:
  cd tools/pd-api-bench && CGO_ENABLED=0 go build -o $(BUILD_BIN_PATH)/pd-api-bench main.go
 pd-recover:
- CGO_ENABLED=0 go build -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -o $(BUILD_BIN_PATH)/pd-recover tools/pd-recover/main.go
+ GOEXPERIMENT=$(BUILD_GOEXPERIMENT) CGO_ENABLED=$(BUILD_TOOL_CGO_ENABLED) go build -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -o $(BUILD_BIN_PATH)/pd-recover tools/pd-recover/main.go
 pd-analysis:
  CGO_ENABLED=0 go build -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS)' -o $(BUILD_BIN_PATH)/pd-analysis tools/pd-analysis/main.go
 pd-heartbeat-bench:

client/client.go

@@ -136,7 +136,7 @@ type Client interface {
  LoadGlobalConfig(ctx context.Context, names []string, configPath string) ([]GlobalConfigItem, int64, error)
  // StoreGlobalConfig set the config from etcd
  StoreGlobalConfig(ctx context.Context, configPath string, items []GlobalConfigItem) error
- // WatchGlobalConfig returns an stream with all global config and updates
+ // WatchGlobalConfig returns a stream with all global config and updates
  WatchGlobalConfig(ctx context.Context, configPath string, revision int64) (chan []GlobalConfigItem, error)
  // UpdateOption updates the client option.
  UpdateOption(option DynamicOption, value interface{}) error

client/http/api.go

@@ -17,24 +17,58 @@ package http
 import (
  "fmt"
  "net/url"
+ "time"
 )
 
 // The following constants are the paths of PD HTTP APIs.
 const (
- HotRead = "/pd/api/v1/hotspot/regions/read"
- HotWrite = "/pd/api/v1/hotspot/regions/write"
- Regions = "/pd/api/v1/regions"
- regionByID = "/pd/api/v1/region/id"
- regionByKey = "/pd/api/v1/region/key"
- regionsByKey = "/pd/api/v1/regions/key"
- regionsByStoreID = "/pd/api/v1/regions/store"
- Stores = "/pd/api/v1/stores"
+ // Metadata
+ HotRead = "/pd/api/v1/hotspot/regions/read"
+ HotWrite = "/pd/api/v1/hotspot/regions/write"
+ HotHistory = "/pd/api/v1/hotspot/regions/history"
+ RegionByIDPrefix = "/pd/api/v1/region/id"
+ regionByKey = "/pd/api/v1/region/key"
+ Regions = "/pd/api/v1/regions"
+ regionsByKey = "/pd/api/v1/regions/key"
+ RegionsByStoreIDPrefix = "/pd/api/v1/regions/store"
+ EmptyRegions = "/pd/api/v1/regions/check/empty-region"
+ accelerateSchedule = "/pd/api/v1/regions/accelerate-schedule"
+ store = "/pd/api/v1/store"
+ Stores = "/pd/api/v1/stores"
+ StatsRegion = "/pd/api/v1/stats/region"
+ // Config
+ Config = "/pd/api/v1/config"
+ ClusterVersion = "/pd/api/v1/config/cluster-version"
+ ScheduleConfig = "/pd/api/v1/config/schedule"
+ ReplicateConfig = "/pd/api/v1/config/replicate"
+ // Rule
+ PlacementRule = "/pd/api/v1/config/rule"
+ PlacementRules = "/pd/api/v1/config/rules"
+ placementRulesByGroup = "/pd/api/v1/config/rules/group"
+ RegionLabelRule = "/pd/api/v1/config/region-label/rule"
+ // Scheduler
+ Schedulers = "/pd/api/v1/schedulers"
+ scatterRangeScheduler = "/pd/api/v1/schedulers/scatter-range-"
+ // Admin
+ ResetTS = "/pd/api/v1/admin/reset-ts"
+ BaseAllocID = "/pd/api/v1/admin/base-alloc-id"
+ SnapshotRecoveringMark = "/pd/api/v1/admin/cluster/markers/snapshot-recovering"
+ // Debug
+ PProfProfile = "/pd/api/v1/debug/pprof/profile"
+ PProfHeap = "/pd/api/v1/debug/pprof/heap"
+ PProfMutex = "/pd/api/v1/debug/pprof/mutex"
+ PProfAllocs = "/pd/api/v1/debug/pprof/allocs"
+ PProfBlock = "/pd/api/v1/debug/pprof/block"
+ PProfGoroutine = "/pd/api/v1/debug/pprof/goroutine"
+ // Others
  MinResolvedTSPrefix = "/pd/api/v1/min-resolved-ts"
+ Status = "/pd/api/v1/status"
+ Version = "/pd/api/v1/version"
 )
 
 // RegionByID returns the path of PD HTTP API to get region by ID.
 func RegionByID(regionID uint64) string {
- return fmt.Sprintf("%s/%d", regionByID, regionID)
+ return fmt.Sprintf("%s/%d", RegionByIDPrefix, regionID)
 }
 
 // RegionByKey returns the path of PD HTTP API to get region by key.
@@ -45,10 +79,66 @@ func RegionByKey(key []byte) string {
 // RegionsByKey returns the path of PD HTTP API to scan regions with given start key, end key and limit parameters.
 func RegionsByKey(startKey, endKey []byte, limit int) string {
  return fmt.Sprintf("%s?start_key=%s&end_key=%s&limit=%d",
- regionsByKey, url.QueryEscape(string(startKey)), url.QueryEscape(string(endKey)), limit)
+ regionsByKey,
+ url.QueryEscape(string(startKey)),
+ url.QueryEscape(string(endKey)),
+ limit)
 }
 
 // RegionsByStoreID returns the path of PD HTTP API to get regions by store ID.
 func RegionsByStoreID(storeID uint64) string {
- return fmt.Sprintf("%s/%d", regionsByStoreID, storeID)
+ return fmt.Sprintf("%s/%d", RegionsByStoreIDPrefix, storeID)
+}
+
+// RegionStatsByKeyRange returns the path of PD HTTP API to get region stats by start key and end key.
+func RegionStatsByKeyRange(startKey, endKey []byte) string {
+ return fmt.Sprintf("%s?start_key=%s&end_key=%s",
+ StatsRegion,
+ url.QueryEscape(string(startKey)),
+ url.QueryEscape(string(endKey)))
+}
+
+// StoreByID returns the store API with store ID parameter.
+func StoreByID(id uint64) string {
+ return fmt.Sprintf("%s/%d", store, id)
+}
+
+// StoreLabelByID returns the store label API with store ID parameter.
+func StoreLabelByID(id uint64) string {
+ return fmt.Sprintf("%s/%d/label", store, id)
+}
+
+// ConfigWithTTLSeconds returns the config API with the TTL seconds parameter.
+func ConfigWithTTLSeconds(ttlSeconds float64) string {
+ return fmt.Sprintf("%s?ttlSecond=%.0f", Config, ttlSeconds)
+}
+
+// PlacementRulesByGroup returns the path of PD HTTP API to get placement rules by group.
+func PlacementRulesByGroup(group string) string {
+ return fmt.Sprintf("%s/%s", placementRulesByGroup, group)
+}
+
+// PlacementRuleByGroupAndID returns the path of PD HTTP API to get placement rule by group and ID.
+func PlacementRuleByGroupAndID(group, id string) string {
+ return fmt.Sprintf("%s/%s/%s", PlacementRule, group, id)
+}
+
+// SchedulerByName returns the scheduler API with the given scheduler name.
+func SchedulerByName(name string) string {
+ return fmt.Sprintf("%s/%s", Schedulers, name)
+}
+
+// ScatterRangeSchedulerWithName returns the scatter range scheduler API with name parameter.
+func ScatterRangeSchedulerWithName(name string) string {
+ return fmt.Sprintf("%s%s", scatterRangeScheduler, name)
+}
+
+// PProfProfileAPIWithInterval returns the pprof profile API with interval parameter.
+func PProfProfileAPIWithInterval(interval time.Duration) string {
+ return fmt.Sprintf("%s?seconds=%d", PProfProfile, interval/time.Second)
+}
+
+// PProfGoroutineWithDebugLevel returns the pprof goroutine API with debug level parameter.
+func PProfGoroutineWithDebugLevel(level int) string {
+ return fmt.Sprintf("%s?debug=%d", PProfGoroutine, level)
 }