Handled feedback. Fixed bugs.

Signed-off-by: Bin Shi <[email protected]>
tikv · Apr 12, 2023 · 97c21e3 · 97c21e3
1 parent 612a93f
commit 97c21e3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pkg/tso/allocator_manager.go b/pkg/tso/allocator_manager.go
@@ -167,7 +167,7 @@ type AllocatorManager struct {
 
 	ctx    context.Context
 	cancel context.CancelFunc
-	// kgID is the keyspace group id
+	// kgID is the keyspace group ID
 	kgID uint32
 	// member is for election use
 	member ElectionMember

diff --git a/pkg/tso/keyspace_group_manager.go b/pkg/tso/keyspace_group_manager.go
@@ -89,7 +89,7 @@ func (s *state) deinitialize() {
 	}
 	wg.Wait()
 
-	log.Info("All keyspace groups closed")
+	log.Info("all keyspace groups closed")
 }
 
 // getAllocatorManager returns the AllocatorManager of the given keyspace group
@@ -108,9 +108,9 @@ func (s *state) getAMWithMembershipCheck(
 	defer s.RUnlock()
 
 	if am := s.ams[keyspaceGroupID]; am != nil {
-		ksg := s.kgs[keyspaceGroupID]
-		if ksg != nil {
-			if _, ok := ksg.KeyspaceLookupTable[keyspaceID]; ok {
+		kg := s.kgs[keyspaceGroupID]
+		if kg != nil {
+			if _, ok := kg.KeyspaceLookupTable[keyspaceID]; ok {
 				return am, keyspaceGroupID, nil
 			}
 		}
@@ -595,6 +595,9 @@ func (kgm *KeyspaceGroupManager) updateKeyspaceGroupMembership(
 
 // deleteKeyspaceGroup deletes the given keyspace group.
 func (kgm *KeyspaceGroupManager) deleteKeyspaceGroup(groupID uint32) {
+	kgm.Lock()
+	defer kgm.Unlock()
+
 	kg := kgm.kgs[groupID]
 	if kg != nil {
 		for _, kid := range kg.Keyspaces {