Skip to content

fix(txmgr): prevent resource leak from unstopped tickers in sendTx #18358

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(txmgr): prevent resource leak from unstopped tickers in sendTx #18358

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
26 changes: 22 additions & 4 deletions op-service/txmgr/txmgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,8 +612,23 @@ func (m *SimpleTxManager) sendTx(ctx context.Context, tx *types.Transaction) (*t
bumpFeeTicker := time.NewTicker(bumpFeeTimeout)
defer bumpFeeTicker.Stop()

var retryTicker *time.Ticker
var retryCh <-chan time.Time
resetRetryTicker := func(interval time.Duration) {
if retryTicker != nil {
retryTicker.Stop()
retryTicker = nil
}
if interval <= 0 {
retryCh = nil
return
}
retryTicker = time.NewTicker(interval)
retryCh = retryTicker.C
}
defer resetRetryTicker(0)

for {
retryTicker := &time.Ticker{}
if !sendState.IsWaitingForConfirmation() {
if m.closed.Load() {
// the tx manager closed and no txs are waiting to be confirmed, give up
Expand All @@ -631,7 +646,9 @@ func (m *SimpleTxManager) sendTx(ctx context.Context, tx *types.Transaction) (*t
}()
rebroadcastInterval := m.GetRebroadcastInterval()
if rebroadcastInterval > 0 {
retryTicker = time.NewTicker(rebroadcastInterval)
resetRetryTicker(rebroadcastInterval)
} else {
resetRetryTicker(0)
}
} else if err != nil {
if retryCount >= m.cfg.MaxRetries {
Expand All @@ -640,7 +657,7 @@ func (m *SimpleTxManager) sendTx(ctx context.Context, tx *types.Transaction) (*t
}
retryCount++
// retry immediately if RetryInterval <= 0:
retryTicker = time.NewTicker(max(1, m.cfg.RetryInterval))
resetRetryTicker(max(1, m.cfg.RetryInterval))
}
}
if err := sendState.CriticalError(); err != nil {
Expand All @@ -653,7 +670,7 @@ func (m *SimpleTxManager) sendTx(ctx context.Context, tx *types.Transaction) (*t
}

select {
case <-retryTicker.C:
case <-retryCh:

case <-bumpFeeTicker.C:
// Enough time has passed, so bump the fees on the next publish attempt in order to avoid delays.
Expand All @@ -667,6 +684,7 @@ func (m *SimpleTxManager) sendTx(ctx context.Context, tx *types.Transaction) (*t
m.metr.TxConfirmed(receipt)
return receipt, nil
}
resetRetryTicker(0)
}
}

Expand Down