From 6ab6c6735969a9f344c6ecde60205365899efacf Mon Sep 17 00:00:00 2001 From: wjhuang2016 Date: Fri, 19 Aug 2022 15:42:14 +0800 Subject: [PATCH] done Signed-off-by: wjhuang2016 --- ddl/db_test.go | 2 ++ ddl/ddl_worker.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ddl/db_test.go b/ddl/db_test.go index 6e67ce761efcc..f4ac4d9f592f5 100644 --- a/ddl/db_test.go +++ b/ddl/db_test.go @@ -1725,4 +1725,6 @@ func TestTiDBDownBeforeUpdateGlobalVersion(t *testing.T) { require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/ddl/mockDownBeforeUpdateGlobalVersion", `return(true)`)) require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/ddl/checkDownBeforeUpdateGlobalVersion", `return(true)`)) tk.MustExec("alter table t add column b int") + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/ddl/mockDownBeforeUpdateGlobalVersion")) + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/ddl/checkDownBeforeUpdateGlobalVersion")) } diff --git a/ddl/ddl_worker.go b/ddl/ddl_worker.go index 191d0864e5b2b..e6bdfb2717820 100644 --- a/ddl/ddl_worker.go +++ b/ddl/ddl_worker.go @@ -1325,7 +1325,7 @@ func (w *worker) waitSchemaSynced(d *ddlCtx, job *model.Job, waitTime time.Durat latestSchemaVersion, err := m.GetSchemaVersionWithNonEmptyDiff() if err != nil { logutil.Logger(w.logCtx).Warn("[ddl] get global version failed", zap.Error(err)) - return nil + return err } failpoint.Inject("checkDownBeforeUpdateGlobalVersion", func(val failpoint.Value) {