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.

Sign up for GitHub

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

Jump to bottom

keyspace, api2: fix the keyspace assignment patrol consistency #6397

Merged
merged 5 commits into from
May 5, 2023
Merged

keyspace, api2: fix the keyspace assignment patrol consistency #6397

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e8e2ac
Fix the keyspace assignment patrol consistency
JmPotato Apr 28, 2023
ab62dbd
Reduce the defer function number
JmPotato Apr 28, 2023
a2bf8a4
Fix patrolKeyspaceAssignmentState lock
JmPotato May 4, 2023
2e1f8d1
Add a TODO
JmPotato May 4, 2023
40b99b2
Merge branch 'master' into fix_keyspace_partrol
rleungx May 5, 2023
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
Prev Previous commit
Next Next commit
Reduce the defer function number 
Signed-off-by: JmPotato <ghzpotato@gmail.com>
  • Loading branch information
@JmPotato
JmPotato committed Apr 28, 2023
commit ab62dbdebd23d8a67f46f8e977f77438296ae5a8
12 changes: 10 additions & 2 deletions pkg/keyspace/keyspace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,15 @@ func (manager *Manager) PatrolKeyspaceAssignment() error {
if err != nil {
return err
}
assigned := false
var (
assigned = false
keyspaceIDsToUnlock = make([]uint32, 0, len(keyspaces))
)
defer func() {
for _, id := range keyspaceIDsToUnlock {
manager.metaLock.Unlock(id)
}
}()
for _, ks := range keyspaces {
if ks == nil {
continue
Expand All @@ -606,7 +614,7 @@ func (manager *Manager) PatrolKeyspaceAssignment() error {
}
}
// Unlock the keyspace meta lock after the whole txn.
defer manager.metaLock.Unlock(ks.Id)
keyspaceIDsToUnlock = append(keyspaceIDsToUnlock, ks.Id)
// If the keyspace doesn't have a group ID, assign it to the default keyspace group.
if !slice.Contains(defaultKeyspaceGroup.Keyspaces, ks.Id) {
defaultKeyspaceGroup.Keyspaces = append(defaultKeyspaceGroup.Keyspaces, ks.Id)
Expand Down