Skip to content

concurrency: fix a few typos #156626

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

Merged
merged 1 commit into from
Oct 31, 2025
Merged

concurrency: fix a few typos #156626

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions pkg/kv/kvserver/concurrency/concurrency_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ func (m *managerImpl) OnLockAcquired(ctx context.Context, acq *roachpb.LockAcqui
}
}

// OnLockMissing implements the Lockmanager interface.
// OnLockMissing implements the LockManager interface.
func (m *managerImpl) OnLockMissing(ctx context.Context, acq *roachpb.LockAcquisition) {
if err := m.lt.MarkIneligibleForExport(acq); err != nil {
// We don't currently expect any errors other than assertion failures that represent
Expand Down Expand Up @@ -668,7 +668,7 @@ func (m *managerImpl) OnRangeLeaseTransferEval() ([]*roachpb.LockAcquisition, in
}

// OnRangeSubumeEval implements the RangeStateListener interface. It is called
// during evalutation of Subsume. The returned LockAcquisition structs represent
// during evaluation of Subsume. The returned LockAcquisition structs represent
// held locks that we may want to flush to disk as replicated.
func (m *managerImpl) OnRangeSubsumeEval() ([]*roachpb.LockAcquisition, int64) {
if !UnreplicatedLockReliabilityMerge.Get(&m.st.SV) {
Expand Down Expand Up @@ -701,8 +701,8 @@ func (m *managerImpl) OnRangeSplit(rhsStartKey roachpb.Key) []roachpb.LockAcquis
m.twq.ClearGE(rhsStartKey)
return lockToMove
} else {
// TODO(ssd): We could call ClearGE here but ignore the
// response. But for now we leave the old behaviour unchanged.
// TODO(ssd): We could call ClearGE here but ignore the response. But for
// now we leave the old behavior unchanged.
const disable = false
m.lt.Clear(disable)
m.twq.Clear(disable)
Expand Down Expand Up @@ -751,13 +751,13 @@ func (m *managerImpl) LockTableMetrics() LockTableMetrics {
func (m *managerImpl) exportUnreplicatedLocks() ([]*roachpb.LockAcquisition, int64) {
// TODO(ssd): Expose a function that allows us to pre-allocate this a bit better.
approximateBatchSize := int64(0)
acquistions := make([]*roachpb.LockAcquisition, 0)
acquisitions := make([]*roachpb.LockAcquisition, 0)
m.lt.ExportUnreplicatedLocks(allKeysSpan, func(acq *roachpb.LockAcquisition) bool {
approximateBatchSize += storage.ApproximateLockTableSize(acq)
acquistions = append(acquistions, acq)
acquisitions = append(acquisitions, acq)
return true
})
return acquistions, approximateBatchSize
return acquisitions, approximateBatchSize
}

// TestingLockTableString implements the MetricExporter interface.
Expand Down