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

mcs: support history hot region in scheduling server #7183

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
11 changes: 3 additions & 8 deletions pkg/mcs/scheduling/server/apis/v1/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"github.com/pingcap/log"
scheserver "github.com/tikv/pd/pkg/mcs/scheduling/server"
"github.com/tikv/pd/pkg/mcs/utils"
"github.com/tikv/pd/pkg/schedule"
sche "github.com/tikv/pd/pkg/schedule/core"
"github.com/tikv/pd/pkg/schedule/handler"
"github.com/tikv/pd/pkg/schedule/operator"
Expand Down Expand Up @@ -68,15 +67,11 @@ type Service struct {
}

type server struct {
server *scheserver.Server
}

func (s *server) GetCoordinator() *schedule.Coordinator {
return s.server.GetCoordinator()
*scheserver.Server
}

func (s *server) GetCluster() sche.SharedCluster {
return s.server.GetCluster()
return s.Server.GetCluster()
}

func createIndentRender() *render.Render {
Expand All @@ -98,7 +93,7 @@ func NewService(srv *scheserver.Service) *Service {
apiHandlerEngine.Use(gzip.Gzip(gzip.DefaultCompression))
apiHandlerEngine.Use(func(c *gin.Context) {
c.Set(multiservicesapi.ServiceContextKey, srv.Server)
c.Set(handlerKey, handler.NewHandler(&server{server: srv.Server}))
c.Set(handlerKey, handler.NewHandler(&server{srv.Server}))
c.Next()
})
apiHandlerEngine.Use(multiservicesapi.ServiceRedirector())
Expand Down
10 changes: 10 additions & 0 deletions pkg/mcs/scheduling/server/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,16 @@ func (o *PersistConfig) GetHotRegionCacheHitsThreshold() int {
return int(o.GetScheduleConfig().HotRegionCacheHitsThreshold)
}

// GetHotRegionsWriteInterval gets interval for PD to store Hot Region information.
func (o *PersistConfig) GetHotRegionsWriteInterval() time.Duration {
return o.GetScheduleConfig().HotRegionsWriteInterval.Duration
}

// GetHotRegionsReservedDays gets days hot region information is kept.
func (o *PersistConfig) GetHotRegionsReservedDays() uint64 {
return o.GetScheduleConfig().HotRegionsReservedDays
}

// GetMaxMovableHotPeerSize returns the max movable hot peer size.
func (o *PersistConfig) GetMaxMovableHotPeerSize() int64 {
return o.GetScheduleConfig().MaxMovableHotPeerSize
Expand Down
75 changes: 64 additions & 11 deletions pkg/mcs/scheduling/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"net/http"
"os"
"os/signal"
"path/filepath"
"strconv"
"sync"
"sync/atomic"
Expand All @@ -37,6 +38,7 @@ import (
"github.com/spf13/cobra"
bs "github.com/tikv/pd/pkg/basicserver"
"github.com/tikv/pd/pkg/core"
"github.com/tikv/pd/pkg/encryption"
"github.com/tikv/pd/pkg/errs"
"github.com/tikv/pd/pkg/mcs/discovery"
"github.com/tikv/pd/pkg/mcs/scheduling/server/config"
Expand All @@ -46,8 +48,12 @@ import (
"github.com/tikv/pd/pkg/mcs/utils"
"github.com/tikv/pd/pkg/member"
"github.com/tikv/pd/pkg/schedule"
sc "github.com/tikv/pd/pkg/schedule/config"
sche "github.com/tikv/pd/pkg/schedule/core"
"github.com/tikv/pd/pkg/schedule/handler"
"github.com/tikv/pd/pkg/schedule/hbstream"
"github.com/tikv/pd/pkg/schedule/schedulers"
"github.com/tikv/pd/pkg/storage"
"github.com/tikv/pd/pkg/storage/endpoint"
"github.com/tikv/pd/pkg/storage/kv"
"github.com/tikv/pd/pkg/utils/apiutil"
Expand Down Expand Up @@ -99,9 +105,11 @@ type Server struct {
serviceID *discovery.ServiceRegistryEntry
serviceRegister *discovery.ServiceRegister

cluster *Cluster
hbStreams *hbstream.HeartbeatStreams
storage *endpoint.StorageEndpoint
cluster *Cluster
hbStreams *hbstream.HeartbeatStreams
storage *endpoint.StorageEndpoint
hotRegionStorage *storage.HotRegionStorage
encryptionKeyManager *encryption.Manager

// for watching the PD API server meta info updates that are related to the scheduling.
configWatcher *config.Watcher
Expand Down Expand Up @@ -155,9 +163,10 @@ func (s *Server) Run() error {

func (s *Server) startServerLoop() {
s.serverLoopCtx, s.serverLoopCancel = context.WithCancel(s.Context())
s.serverLoopWg.Add(2)
s.serverLoopWg.Add(3)
go s.primaryElectionLoop()
go s.updateAPIServerMemberLoop()
go s.encryptionKeyManagerLoop()
}

func (s *Server) updateAPIServerMemberLoop() {
Expand Down Expand Up @@ -239,6 +248,17 @@ func (s *Server) primaryElectionLoop() {
}
}

// encryptionKeyManagerLoop is used to start monitor encryption key changes.
func (s *Server) encryptionKeyManagerLoop() {
defer logutil.LogPanic()
defer s.serverLoopWg.Done()

ctx, cancel := context.WithCancel(s.serverLoopCtx)
defer cancel()
s.encryptionKeyManager.StartBackgroundLoop(ctx)
log.Info("server is closed, exist encryption key manager loop")
}

func (s *Server) campaignLeader() {
log.Info("start to campaign the primary/leader", zap.String("campaign-scheduling-primary-name", s.participant.Name()))
if err := s.participant.CampaignLeader(s.cfg.LeaderLease); err != nil {
Expand Down Expand Up @@ -324,6 +344,11 @@ func (s *Server) Close() {
if s.GetHTTPClient() != nil {
s.GetHTTPClient().CloseIdleConnections()
}

if err := s.hotRegionStorage.Close(); err != nil {
log.Error("close hot region storage meet error", errs.ZapError(err))
}

log.Info("scheduling server is closed")
}

Expand Down Expand Up @@ -364,7 +389,21 @@ func (s *Server) GetBasicCluster() *core.BasicCluster {

// GetCoordinator returns the coordinator.
func (s *Server) GetCoordinator() *schedule.Coordinator {
return s.GetCluster().GetCoordinator()
c := s.GetCluster()
if c == nil {
return nil
}
return c.GetCoordinator()
}

// GetEncryptionKeyManager returns the encryption key manager.
func (s *Server) GetEncryptionKeyManager() *encryption.Manager {
return s.encryptionKeyManager
}

// GetSharedConfig returns the shared config.
func (s *Server) GetSharedConfig() sc.SharedConfigProvider {
return s.persistConfig
}

// ServerLoopWgDone decreases the server loop wait group.
Expand Down Expand Up @@ -392,6 +431,14 @@ func (s *Server) GetLeaderListenUrls() []string {
return s.participant.GetLeaderListenUrls()
}

type svr struct {
*Server
}

func (s *svr) GetCluster() sche.SharedCluster {
return s.Server.GetCluster()
}

func (s *Server) startServer() (err error) {
if s.clusterID, err = utils.InitClusterID(s.Context(), s.GetClient()); err != nil {
return err
Expand Down Expand Up @@ -419,6 +466,18 @@ func (s *Server) startServer() (err error) {
return err
}

s.encryptionKeyManager, err = encryption.NewManager(s.GetClient(), &s.cfg.Security.Encryption)
if err != nil {
return err
}

h := handler.NewHandler(&svr{s})
s.hotRegionStorage, err = storage.NewHotRegionsStorage(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will it make the scheduling server stateful?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will create a leveldb in scheduling server.
If hope to store it in api server, it means that we need to pull all hot region info from scheduling server per 10 minutes
https://docs.pingcap.com/zh/tidb/stable/information-schema-tidb-hot-regions-history

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Scheduling server should be stateless.

s.Context(), filepath.Join(s.cfg.DataDir, "hot-region"), s.encryptionKeyManager, h)
if err != nil {
return err
}

serverReadyChan := make(chan struct{})
defer close(serverReadyChan)
s.startServerLoop()
Expand Down Expand Up @@ -489,12 +548,6 @@ func (s *Server) stopWatcher() {
s.metaWatcher.Close()
}

// GetPersistConfig returns the persist config.
// It's used to test.
func (s *Server) GetPersistConfig() *config.PersistConfig {
return s.persistConfig
}

// CreateServer creates the Server
func CreateServer(ctx context.Context, cfg *config.Config) *Server {
svr := &Server{
Expand Down
2 changes: 1 addition & 1 deletion pkg/mcs/scheduling/server/testutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ func GenerateConfig(c *config.Config) (*config.Config, error) {
if err != nil {
return nil, err
}

cfg.DataDir = c.DataDir
return cfg, nil
}
3 changes: 3 additions & 0 deletions pkg/schedule/config/config_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,11 @@ type SharedConfigProvider interface {
IsWitnessAllowed() bool
IsPlacementRulesCacheEnabled() bool
SetHaltScheduling(bool, string)
GetHotRegionsWriteInterval() time.Duration
GetHotRegionsReservedDays() uint64

// for test purpose
SetPlacementRuleEnabled(bool)
SetPlacementRulesCacheEnabled(bool)
SetEnableWitness(bool)
}
Expand Down
19 changes: 19 additions & 0 deletions pkg/schedule/coordinator.go
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,25 @@ func (c *Coordinator) GetHotRegionsByType(typ utils.RWType) *statistics.StoreHot
return infos
}

// GetHotRegions gets hot regions' statistics by RWType and storeIDs.
// If storeIDs is empty, it returns all hot regions' statistics by RWType.
func (c *Coordinator) GetHotRegions(typ utils.RWType, storeIDs ...uint64) *statistics.StoreHotPeersInfos {
hotRegions := c.GetHotRegionsByType(typ)
if len(storeIDs) > 0 && hotRegions != nil {
asLeader := statistics.StoreHotPeersStat{}
asPeer := statistics.StoreHotPeersStat{}
for _, storeID := range storeIDs {
asLeader[storeID] = hotRegions.AsLeader[storeID]
asPeer[storeID] = hotRegions.AsPeer[storeID]
}
return &statistics.StoreHotPeersInfos{
AsLeader: asLeader,
AsPeer: asPeer,
}
}
return hotRegions
}

// GetWaitGroup returns the wait group. Only for test purpose.
func (c *Coordinator) GetWaitGroup() *sync.WaitGroup {
return &c.wg
Expand Down
Loading
Loading