Skip to content

Commit b779390

Browse files
committed
feat: genesis add attribute isMaster
1 parent e9998e4 commit b779390

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

server/controller/cloud/kubernetes_gather/kubernetes_gather_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func TestKubernetes(t *testing.T) {
8585
})
8686
defer k8sInfoPatch.Reset()
8787

88-
g := genesis.NewGenesis(context.Background(), &config.ControllerConfig{})
88+
g := genesis.NewGenesis(context.Background(), true, &config.ControllerConfig{})
8989
vJsonData, _ := os.ReadFile("./testfiles/vinterfaces.json")
9090
var vData gcommon.GenesisSyncDataResponse
9191
json.Unmarshal(vJsonData, &vData)

server/controller/controller/controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func Start(ctx context.Context, configPath, serverLogFile string, shared *server
125125

126126
router.SetInitStageForHealthChecker("Genesis init")
127127
// 启动genesis
128-
g := genesis.NewGenesis(ctx, cfg)
128+
g := genesis.NewGenesis(ctx, isMasterController, cfg)
129129

130130
// start tagrecorder before manager to prevent recorder from publishing message when tagrecorder is not ready
131131
router.SetInitStageForHealthChecker("TagRecorder init")

server/controller/genesis/genesis.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ type Genesis struct {
4343
Synchronizer *grpc.SynchronizerServer
4444
}
4545

46-
func NewGenesis(ctx context.Context, config *config.ControllerConfig) *Genesis {
46+
func NewGenesis(ctx context.Context, isMaster bool, config *config.ControllerConfig) *Genesis {
4747
syncQueue := queue.NewOverwriteQueue("genesis-sync-data", config.GenesisCfg.QueueLengths)
4848
kubernetesQueue := queue.NewOverwriteQueue("genesis-k8s-data", config.GenesisCfg.QueueLengths)
4949

50-
genesisSync := sstore.NewGenesisSync(ctx, syncQueue, config)
50+
genesisSync := sstore.NewGenesisSync(ctx, isMaster, syncQueue, config)
5151
genesisSync.Start()
5252

5353
genesisK8S := kstore.NewGenesisKubernetes(ctx, kubernetesQueue, config)

server/controller/genesis/store/sync/run.go

+13-11
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,25 @@ import (
4343
var log = logger.MustGetLogger("genesis.store.sync")
4444

4545
type GenesisSync struct {
46-
data atomic.Value
47-
ctx context.Context
48-
cancel context.CancelFunc
49-
queue queue.QueueReader
50-
config *config.ControllerConfig
46+
isMaster bool
47+
data atomic.Value
48+
ctx context.Context
49+
cancel context.CancelFunc
50+
queue queue.QueueReader
51+
config *config.ControllerConfig
5152
}
5253

53-
func NewGenesisSync(ctx context.Context, queue queue.QueueReader, config *config.ControllerConfig) *GenesisSync {
54+
func NewGenesisSync(ctx context.Context, isMaster bool, queue queue.QueueReader, config *config.ControllerConfig) *GenesisSync {
5455
var data atomic.Value
5556
data.Store(common.GenesisSyncData{})
5657
ctx, cancel := context.WithCancel(ctx)
5758
return &GenesisSync{
58-
ctx: ctx,
59-
cancel: cancel,
60-
data: data,
61-
queue: queue,
62-
config: config,
59+
isMaster: isMaster,
60+
ctx: ctx,
61+
cancel: cancel,
62+
data: data,
63+
queue: queue,
64+
config: config,
6365
}
6466
}
6567

0 commit comments

Comments
 (0)