support triggering an event through HTTP API

Signed-off-by: Ryan Leung <[email protected]>
tikv · Nov 3, 2022 · 47af78a · 47af78a
1 parent 6fcb528
commit 47af78a
Show file tree

Hide file tree

Showing 18 changed files with 217 additions and 451 deletions.
diff --git a/tools/pd-simulator/main.go b/tools/pd-simulator/main.go
@@ -17,16 +17,13 @@ package main
 import (
 	"context"
 	"fmt"
-	"net/http"
-	"net/http/pprof"
 	"os"
 	"os/signal"
 	"syscall"
 	"time"
 
 	"github.com/BurntSushi/toml"
 	"github.com/pingcap/log"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
 	flag "github.com/spf13/pflag"
 	"github.com/tikv/pd/server"
 	"github.com/tikv/pd/server/api"
@@ -98,8 +95,7 @@ func main() {
 
 func run(simCase string, simConfig *simulator.SimConfig) {
 	if *pdAddr != "" {
-		go runHTTPServer()
-		simStart(*pdAddr, simCase, simConfig)
+		simStart(*pdAddr, *statusAddress, simCase, simConfig)
 	} else {
 		local, clean := NewSingleServer(context.Background(), simConfig)
 		err := local.Run()
@@ -112,25 +108,10 @@ func run(simCase string, simConfig *simulator.SimConfig) {
 			}
 			time.Sleep(100 * time.Millisecond)
 		}
-		simStart(local.GetAddr(), simCase, simConfig, clean)
+		simStart(local.GetAddr(), "", simCase, simConfig, clean)
 	}
 }
 
-func runHTTPServer() {
-	http.Handle("/metrics", promhttp.Handler())
-	// profile API
-	http.HandleFunc("/pprof/profile", pprof.Profile)
-	http.HandleFunc("/pprof/trace", pprof.Trace)
-	http.HandleFunc("/pprof/symbol", pprof.Symbol)
-	http.Handle("/pprof/heap", pprof.Handler("heap"))
-	http.Handle("/pprof/mutex", pprof.Handler("mutex"))
-	http.Handle("/pprof/allocs", pprof.Handler("allocs"))
-	http.Handle("/pprof/block", pprof.Handler("block"))
-	http.Handle("/pprof/goroutine", pprof.Handler("goroutine"))
-	// nolint
-	http.ListenAndServe(*statusAddress, nil)
-}
-
 // NewSingleServer creates a pd server for simulator.
 func NewSingleServer(ctx context.Context, simConfig *simulator.SimConfig) (*server.Server, server.CleanupFunc) {
 	err := simConfig.ServerConfig.SetupLogger()
@@ -162,9 +143,9 @@ func cleanServer(cfg *config.Config) {
 	os.RemoveAll(cfg.DataDir)
 }
 
-func simStart(pdAddr string, simCase string, simConfig *simulator.SimConfig, clean ...server.CleanupFunc) {
+func simStart(pdAddr, statusAddress string, simCase string, simConfig *simulator.SimConfig, clean ...server.CleanupFunc) {
 	start := time.Now()
-	driver, err := simulator.NewDriver(pdAddr, simCase, simConfig)
+	driver, err := simulator.NewDriver(pdAddr, statusAddress, simCase, simConfig)
 	if err != nil {
 		simutil.Logger.Fatal("create driver error", zap.Error(err))
 	}

diff --git a/tools/pd-simulator/simulator/cases/add_nodes.go b/tools/pd-simulator/simulator/cases/add_nodes.go
diff --git a/tools/pd-simulator/simulator/cases/add_nodes_dynamic.go b/tools/pd-simulator/simulator/cases/add_nodes_dynamic.go
diff --git a/tools/pd-simulator/simulator/cases/balance_leader.go b/tools/pd-simulator/simulator/cases/balance_leader.go
@@ -30,7 +30,7 @@ func newBalanceLeader() *Case {
 
 	for i := 1; i <= storeNum; i++ {
 		simCase.Stores = append(simCase.Stores, &Store{
-			ID:        IDAllocator.nextID(),
+			ID:        simutil.IDAllocator.NextID(),
 			Status:    metapb.StoreState_Up,
 			Capacity:  1 * units.TiB,
 			Available: 900 * units.GiB,
@@ -40,12 +40,12 @@ func newBalanceLeader() *Case {
 
 	for i := 0; i < storeNum*regionNum/3; i++ {
 		peers := []*metapb.Peer{
-			{Id: IDAllocator.nextID(), StoreId: uint64(storeNum)},
-			{Id: IDAllocator.nextID(), StoreId: uint64((i+1)%(storeNum-1)) + 1},
-			{Id: IDAllocator.nextID(), StoreId: uint64((i+2)%(storeNum-1)) + 1},
+			{Id: simutil.IDAllocator.NextID(), StoreId: uint64(storeNum)},
+			{Id: simutil.IDAllocator.NextID(), StoreId: uint64((i+1)%(storeNum-1)) + 1},
+			{Id: simutil.IDAllocator.NextID(), StoreId: uint64((i+2)%(storeNum-1)) + 1},
 		}
 		simCase.Regions = append(simCase.Regions, Region{
-			ID:     IDAllocator.nextID(),
+			ID:     simutil.IDAllocator.NextID(),
 			Peers:  peers,
 			Leader: peers[0],
 			Size:   96 * units.MiB,

diff --git a/tools/pd-simulator/simulator/cases/cases.go b/tools/pd-simulator/simulator/cases/cases.go
@@ -61,37 +61,10 @@ type Case struct {
 	Labels  typeutil.StringSlice
 }
 
-// IDAllocator is used to alloc unique ID.
-type idAllocator struct {
-	id uint64
-}
-
-// nextID gets the next unique ID.
-func (a *idAllocator) nextID() uint64 {
-	a.id++
-	return a.id
-}
-
-// ResetID resets the IDAllocator.
-func (a *idAllocator) ResetID() {
-	a.id = 0
-}
-
-// GetID gets the current ID.
-func (a *idAllocator) GetID() uint64 {
-	return a.id
-}
-
-// IDAllocator is used to alloc unique ID.
-var IDAllocator idAllocator
-
 // CaseMap is a mapping of the cases to the their corresponding initialize functions.
 var CaseMap = map[string]func() *Case{
 	"balance-leader":            newBalanceLeader,
 	"redundant-balance-region":  newRedundantBalanceRegion,
-	"add-nodes":                 newAddNodes,
-	"add-nodes-dynamic":         newAddNodesDynamic,
-	"delete-nodes":              newDeleteNodes,
 	"region-split":              newRegionSplit,
 	"region-merge":              newRegionMerge,
 	"hot-read":                  newHotRead,
@@ -113,10 +86,6 @@ func NewCase(name string) *Case {
 	return nil
 }
 
-func leaderAndRegionIsUniform(leaderCount, regionCount, regionNum int, threshold float64) bool {
-	return isUniform(leaderCount, regionNum/3, threshold) && isUniform(regionCount, regionNum, threshold)
-}
-
 func isUniform(count, meanCount int, threshold float64) bool {
 	maxCount := int((1.0 + threshold) * float64(meanCount))
 	minCount := int((1.0 - threshold) * float64(meanCount))
@@ -138,11 +107,3 @@ func getRegionNum() int {
 	}
 	return regionNum
 }
-
-func getNoEmptyStoreNum(storeNum int, noEmptyRatio float64) uint64 {
-	noEmptyStoreNum := uint64(float64(storeNum) * noEmptyRatio)
-	if noEmptyStoreNum < 3 || noEmptyStoreNum == uint64(storeNum) {
-		noEmptyStoreNum = 3
-	}
-	return noEmptyStoreNum
-}