From e88e809d7843645aec2244f969c1305a5cad3714 Mon Sep 17 00:00:00 2001 From: Bin Shi Date: Wed, 12 Apr 2023 15:13:16 -0700 Subject: [PATCH] Refine keyspace.Bootstrap Signed-off-by: Bin Shi --- pkg/keyspace/tso_keyspace_group.go | 7 ++++--- pkg/tso/keyspace_group_manager.go | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/keyspace/tso_keyspace_group.go b/pkg/keyspace/tso_keyspace_group.go index 31e57ebaed7..ed0b46cbe94 100644 --- a/pkg/keyspace/tso_keyspace_group.go +++ b/pkg/keyspace/tso_keyspace_group.go @@ -58,6 +58,10 @@ func NewKeyspaceGroupManager(ctx context.Context, store endpoint.KeyspaceGroupSt // Bootstrap saves default keyspace group info and init group mapping in the memory. func (m *GroupManager) Bootstrap() error { + // Force the membership restriction that the default keyspace must belong to default keyspace group. + // Have no information to specify the distribution of the default keyspace group replicas, so just + // leave the replica/member list empty. The TSO service will assign the default keyspace group replica + // to every tso node/pod by default. defaultKeyspaceGroup := &endpoint.KeyspaceGroup{ ID: utils.DefaultKeyspaceGroupID, UserKind: endpoint.Basic.String(), @@ -72,9 +76,6 @@ func (m *GroupManager) Bootstrap() error { return err } - userKind := endpoint.StringUserKind(defaultKeyspaceGroup.UserKind) - m.groups[userKind].Put(defaultKeyspaceGroup) - // Load all the keyspace groups from the storage and add to the respective userKind groups. groups, err := m.store.LoadKeyspaceGroups(utils.DefaultKeyspaceGroupID, 0) if err != nil { diff --git a/pkg/tso/keyspace_group_manager.go b/pkg/tso/keyspace_group_manager.go index 80dae7ea8e9..8d8a1c5affc 100644 --- a/pkg/tso/keyspace_group_manager.go +++ b/pkg/tso/keyspace_group_manager.go @@ -280,7 +280,8 @@ func (kgm *KeyspaceGroupManager) checkInitProgress(ctx context.Context, cancel c } func (kgm *KeyspaceGroupManager) initDefaultKeysapceGroup(keyspaces []uint32) { - log.Info("initializing default keyspace group", zap.Any("keyspaces", keyspaces)) + log.Info("initializing default keyspace group", + zap.Int("keyspaces-length", len(keyspaces))) group := &endpoint.KeyspaceGroup{ ID: mcsutils.DefaultKeyspaceGroupID,