Skip to content

Commit

Permalink
cdc: log slow conflict detect every 60s (#11251)
Browse files Browse the repository at this point in the history
close #11271
  • Loading branch information
hicqu authored and ti-chi-bot committed Jun 11, 2024
1 parent d9f6759 commit 4229e1b
Showing 1 changed file with 33 additions and 1 deletion.
34 changes: 33 additions & 1 deletion cdc/sink/dmlsink/txn/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ type worker struct {
flushInterval time.Duration
hasPending bool
postTxnExecutedCallbacks []func()

lastSlowConflictDetectLog map[model.TableID]time.Time

Check failure on line 50 in cdc/sink/dmlsink/txn/worker.go

View workflow job for this annotation

GitHub Actions / Mac OS Build

undefined: model
}

func newWorker(ctx context.Context, ID int, backend backend, workerCount int) *worker {
Expand All @@ -68,6 +70,8 @@ func newWorker(ctx context.Context, ID int, backend backend, workerCount int) *w
flushInterval: backend.MaxFlushInterval(),
hasPending: false,
postTxnExecutedCallbacks: make([]func(), 0, 1024),

lastSlowConflictDetectLog: make(map[model.TableID]time.Time),

Check failure on line 74 in cdc/sink/dmlsink/txn/worker.go

View workflow job for this annotation

GitHub Actions / Mac OS Build

undefined: model
}
}

Expand All @@ -85,6 +89,9 @@ func (w *worker) run(txnCh <-chan causality.TxnWithNotifier[*txnEvent]) error {
zap.String("changefeedID", w.changefeed),
zap.Int("workerID", w.ID))

cleanSlowLogHistory := time.NewTicker(time.Hour)
defer cleanSlowLogHistory.Stop()

start := time.Now()
for {
select {
Expand All @@ -93,6 +100,15 @@ func (w *worker) run(txnCh <-chan causality.TxnWithNotifier[*txnEvent]) error {
zap.String("changefeedID", w.changefeed),
zap.Int("workerID", w.ID))
return nil
case <-cleanSlowLogHistory.C:
lastSlowConflictDetectLog := w.lastSlowConflictDetectLog
w.lastSlowConflictDetectLog = make(map[model.TableID]time.Time)

Check failure on line 105 in cdc/sink/dmlsink/txn/worker.go

View workflow job for this annotation

GitHub Actions / Mac OS Build

undefined: model
now := time.Now()
for tableID, lastLog := range lastSlowConflictDetectLog {
if now.Sub(lastLog) <= time.Minute {
w.lastSlowConflictDetectLog[tableID] = lastLog
}
}
case txn := <-txnCh:
// we get the data from txnCh.out until no more data here or reach the state that can be flushed.
// If no more data in txnCh.out, and also not reach the state that can be flushed,
Expand Down Expand Up @@ -149,8 +165,24 @@ func (w *worker) onEvent(txn *txnEvent, postTxnExecuted func()) bool {
return false
}

w.metricConflictDetectDuration.Observe(txn.conflictResolved.Sub(txn.start).Seconds())
conflictDetectTime := txn.conflictResolved.Sub(txn.start).Seconds()
w.metricConflictDetectDuration.Observe(conflictDetectTime)
w.metricQueueDuration.Observe(time.Since(txn.start).Seconds())

// Log tables which conflict detect time larger than 1 minute.
if conflictDetectTime > float64(60) {
now := time.Now()
// Log slow conflict detect tables every minute.
if lastLog, ok := w.lastSlowConflictDetectLog[txn.Event.PhysicalTableID]; !ok || now.Sub(lastLog) > time.Minute {

Check failure on line 176 in cdc/sink/dmlsink/txn/worker.go

View workflow job for this annotation

GitHub Actions / Mac OS Build

txn.Event.PhysicalTableID undefined (type *"github.com/pingcap/tiflow/cdc/model".SingleTableTxn has no field or method PhysicalTableID)
log.Warn("Transaction dmlSink finds a slow transaction in conflict detector",
zap.String("changefeedID", w.changefeed),
zap.Int("workerID", w.ID),
zap.Int64("TableID", txn.Event.PhysicalTableID),

Check failure on line 180 in cdc/sink/dmlsink/txn/worker.go

View workflow job for this annotation

GitHub Actions / Mac OS Build

txn.Event.PhysicalTableID undefined (type *"github.com/pingcap/tiflow/cdc/model".SingleTableTxn has no field or method PhysicalTableID)
zap.Float64("seconds", conflictDetectTime))
w.lastSlowConflictDetectLog[txn.Event.PhysicalTableID] = now

Check failure on line 182 in cdc/sink/dmlsink/txn/worker.go

View workflow job for this annotation

GitHub Actions / Mac OS Build

txn.Event.PhysicalTableID undefined (type *"github.com/pingcap/tiflow/cdc/model".SingleTableTxn has no field or method PhysicalTableID)
}
}

w.metricTxnWorkerHandledRows.Add(float64(len(txn.Event.Rows)))
w.postTxnExecutedCallbacks = append(w.postTxnExecutedCallbacks, postTxnExecuted)
return w.backend.OnTxnEvent(txn.TxnCallbackableEvent)
Expand Down

0 comments on commit 4229e1b

Please sign in to comment.