From fe2f767644a32a50ea89541ee45fabe799823250 Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Thu, 24 Jun 2021 11:01:23 +0800 Subject: [PATCH] error: fix wrong error message of ErrGCTTLExceeded (#2121) (#2126) --- errors.toml | 2 +- pkg/errors/errors.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/errors.toml b/errors.toml index 2fe0b6c72e6..222c9f4c2d2 100755 --- a/errors.toml +++ b/errors.toml @@ -278,7 +278,7 @@ event is larger than the total memory quota, size: %d, quota: %d ["CDC:ErrGCTTLExceeded"] error = ''' -the checkpoint-ts(%d) lag of the changefeed(%s) %d has exceeded the GC TTL +the checkpoint-ts(%d) lag of the changefeed(%s) has exceeded the GC TTL ''' ["CDC:ErrGRPCDialFailed"] diff --git a/pkg/errors/errors.go b/pkg/errors/errors.go index 6222997971b..5a4858eba8d 100644 --- a/pkg/errors/errors.go +++ b/pkg/errors/errors.go @@ -187,7 +187,7 @@ var ( ErrUpdateServiceSafepointFailed = errors.Normalize("updating service safepoint failed", errors.RFCCodeText("CDC:ErrUpdateServiceSafepointFailed")) ErrStartTsBeforeGC = errors.Normalize("fail to create changefeed because start-ts %d is earlier than GC safepoint at %d", errors.RFCCodeText("CDC:ErrStartTsBeforeGC")) ErrSnapshotLostByGC = errors.Normalize("fail to create or maintain changefeed due to snapshot loss caused by GC. checkpoint-ts %d is earlier than GC safepoint at %d", errors.RFCCodeText("CDC:ErrSnapshotLostByGC")) - ErrGCTTLExceeded = errors.Normalize("the checkpoint-ts(%d) lag of the changefeed(%s) %d has exceeded the GC TTL", errors.RFCCodeText("CDC:ErrGCTTLExceeded")) + ErrGCTTLExceeded = errors.Normalize("the checkpoint-ts(%d) lag of the changefeed(%s) has exceeded the GC TTL", errors.RFCCodeText("CDC:ErrGCTTLExceeded")) ErrNotOwner = errors.Normalize("this capture is not a owner", errors.RFCCodeText("CDC:ErrNotOwner")) ErrTableListenReplicated = errors.Normalize("A table is being replicated by at least two processors(%s, %s), please report a bug", errors.RFCCodeText("CDC:ErrTableListenReplicated")) // EtcdWorker related errors. Internal use only.