Skip to content

Commit

Permalink
Revert #98150
Browse files Browse the repository at this point in the history
This reverts #98150 because we think it introduced a problem that was detected
via the `replicate/wide` roachtest[^1]. It seems that for reasons still unknown
we do rely on the periodic gossip trigger on liveness lease extensions.

[^1]: #99268 (comment)

Touches #99268.
Touches #97966.
Closes #99268.
Touches #98945.

Epic: none
Release note: None
  • Loading branch information
tbg committed Mar 27, 2023
1 parent ff498ad commit 025c660
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions pkg/kv/kvserver/replica_proposal.go
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,7 @@ func (r *Replica) leasePostApplyLocked(
// this gossip if we're taking over after a leaseholder failure. In both cases,
// incremental liveness updates may have been lost, so we want to make sure that
// the latest view of node liveness ends up in gossip.
nls := keys.NodeLivenessSpan
if leaseChangingHands && iAmTheLeaseHolder && kvserverbase.ContainsKeyRange(r.descRLocked(), nls.Key, nls.EndKey) {
if leaseChangingHands && iAmTheLeaseHolder {
// NB: run these in an async task to keep them out of the critical section
// (r.mu is held here).
_ = r.store.stopper.RunAsyncTask(r.AnnotateCtx(context.Background()), "lease-triggers", func(ctx context.Context) {
Expand Down

0 comments on commit 025c660

Please sign in to comment.