From 6d12691e96ecf16fd39790568c6e86b693c6f20d Mon Sep 17 00:00:00 2001 From: Yilin Chen Date: Wed, 10 Mar 2021 17:28:28 +0800 Subject: [PATCH] fix false positive admin check table in bank2 Signed-off-by: Yilin Chen --- tests/bank2/bank2.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/bank2/bank2.go b/tests/bank2/bank2.go index 8da6dc3bd..aefac6965 100644 --- a/tests/bank2/bank2.go +++ b/tests/bank2/bank2.go @@ -326,9 +326,15 @@ func (c *bank2Client) verify(db *sql.DB) { if _, err := tx.Exec("ADMIN CHECK TABLE bank2_accounts"); err != nil { log.Errorf("[%s] ADMIN CHECK TABLE bank2_accounts fails: %v", c, err) - atomic.StoreInt32(&c.stop, 1) - c.wg.Wait() - log.Fatalf("[%s] ADMIN CHECK TABLE bank2_accounts fails: %v", c, err) + errStr := err.Error() + if strings.Contains(errStr, "1105") && + !(strings.Contains(errStr, "cancelled DDL job") || + strings.Contains(errStr, "Information schema is changed") || + strings.Contains(errStr, "TiKV server timeout")) { + atomic.StoreInt32(&c.stop, 1) + c.wg.Wait() + log.Fatalf("[%s] ADMIN CHECK TABLE bank2_accounts fails: %v", c, err) + } } }