Skip to content

Commit fa11d2f

Browse files
craig[bot]stevendannajeffswenson
committed
156626: concurrency: fix a few typos r=arulajmani a=stevendanna Release note: none Epic: None 156657: logical: remove crud writer from metamorphic tests r=jeffswenson a=jeffswenson The crud writer has an unknown issue in multi-tenant environments. Release note: none Informs: #156640 Co-authored-by: Steven Danna <[email protected]> Co-authored-by: Jeff Swenson <[email protected]>
3 parents 24bd59b + 91cf818 + 32e36f6 commit fa11d2f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
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.

pkg/sql/sqlclustersettings/clustersettings.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ var LDRImmediateModeWriter = settings.RegisterStringSetting(
145145
"logical_replication.consumer.immediate_mode_writer",
146146
"the writer to use when in immediate mode",
147147
// TODO(jeffswenson): make the crud writer the default
148-
metamorphic.ConstantWithTestChoice("logical_replication.consumer.immediate_mode_writer", string(LDRWriterTypeLegacyKV), string(LDRWriterTypeCRUD), string(LDRWriterTypeSQL)),
148+
metamorphic.ConstantWithTestChoice("logical_replication.consumer.immediate_mode_writer", string(LDRWriterTypeLegacyKV), string(LDRWriterTypeSQL)),
149149
settings.WithValidateString(func(sv *settings.Values, val string) error {
150150
if val != string(LDRWriterTypeSQL) && val != string(LDRWriterTypeLegacyKV) && val != string(LDRWriterTypeCRUD) {
151151
return errors.Newf("immediate mode writer must be either 'sql', 'legacy-kv', or 'crud', got '%s'", val)

0 commit comments

Comments
 (0)