Skip to content

Commit 5950afe

Browse files
committed
catalog/lease: remove refreshAllLeases channel
Release note: None
1 parent 1fe4a55 commit 5950afe

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

pkg/sql/catalog/lease/lease.go

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,12 +1098,11 @@ type Manager struct {
10981098
// should only be used if we currently have an active lease on the respective
10991099
// id; otherwise, the mapping may well be stale.
11001100
// Not protected by mu.
1101-
names nameCache
1102-
testingKnobs ManagerTestingKnobs
1103-
ambientCtx log.AmbientContext
1104-
stopper *stop.Stopper
1105-
sem *quotapool.IntPool
1106-
refreshAllLeases chan struct{}
1101+
names nameCache
1102+
testingKnobs ManagerTestingKnobs
1103+
ambientCtx log.AmbientContext
1104+
stopper *stop.Stopper
1105+
sem *quotapool.IntPool
11071106

11081107
// descUpdateCh receives updated descriptors from the range feed.
11091108
descUpdateCh chan catalog.Descriptor
@@ -1209,7 +1208,6 @@ func NewLeaseManager(
12091208
ambientCtx: ambientCtx,
12101209
stopper: stopper,
12111210
sem: quotapool.NewIntPool("lease manager", leaseConcurrencyLimit),
1212-
refreshAllLeases: make(chan struct{}),
12131211
}
12141212
lm.leaseGeneration.Swap(1) // Start off with 1 as the initial value.
12151213
lm.storage.regionPrefix = &atomic.Value{}
@@ -1880,8 +1878,6 @@ func (m *Manager) RunBackgroundLeasingTask(ctx context.Context) {
18801878
case <-m.stopper.ShouldQuiesce():
18811879
return
18821880

1883-
case <-m.refreshAllLeases:
1884-
m.refreshSomeLeases(ctx, true /*refreshAll*/)
18851881
case <-rangeFeedProgressWatchDog.C:
18861882
rangeFeedProgressWatchDog.Read = true
18871883
// Detect if the range feed has stopped making

0 commit comments

Comments
 (0)