Skip to content

Commit 91cf818

Browse files
committed
concurrency: fix a few typos
Release note: none Epic: None
1 parent bedfbd7 commit 91cf818

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

pkg/kv/kvserver/concurrency/concurrency_manager.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ func (m *managerImpl) OnLockAcquired(ctx context.Context, acq *roachpb.LockAcqui
611611
}
612612
}
613613

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

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

763763
// TestingLockTableString implements the MetricExporter interface.

0 commit comments

Comments
 (0)