Skip to content

Commit 6e62f56

Browse files
authored
ddl notifier: allow another error in CI assert (#59503)
close #59501
1 parent beda908 commit 6e62f56

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

pkg/ddl/notifier/subscribe.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,9 @@ func (n *DDLNotifier) start() {
162162
case <-ticker.C:
163163
if err := n.processEvents(ctx); err != nil {
164164
intest.Assert(
165-
errors.ErrorEqual(err, context.Canceled) || strings.Contains(err.Error(), "mock handleTaskOnce error"),
165+
errors.ErrorEqual(err, context.Canceled) ||
166+
strings.Contains(err.Error(), "mock handleTaskOnce error") ||
167+
strings.Contains(err.Error(), "session pool closed"),
166168
fmt.Sprintf("error processing events: %v", err),
167169
)
168170
logutil.Logger(ctx).Error("Error processing events", zap.Error(err))

pkg/statistics/handle/ddl/ddl.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ func (h *ddlHandlerImpl) HandleDDLEvent(ctx context.Context, sctx sessionctx.Con
5454
err := h.sub.handle(ctx, sctx, s)
5555
if err != nil {
5656
intest.Assert(
57-
errors.ErrorEqual(err, context.Canceled) || strings.Contains(err.Error(), "mock handleTaskOnce error"),
57+
errors.ErrorEqual(err, context.Canceled) ||
58+
strings.Contains(err.Error(), "mock handleTaskOnce error") ||
59+
strings.Contains(err.Error(), "session pool closed"),
5860
fmt.Sprintf("handle ddl event failed, err: %v", err),
5961
)
6062
}

0 commit comments

Comments
 (0)