Merge branch 'master' into fix-trace

rleungx · Nov 25, 2024 · dc0688e · dc0688e
2 parents e7072cc + 21a04cb
commit dc0688e
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 894 deletions.
diff --git a/errors.toml b/errors.toml
@@ -901,16 +901,6 @@ error = '''
 reset user timestamp failed, %s
 '''
 
-["PD:tso:ErrSetLocalTSOConfig"]
-error = '''
-set local tso config failed, %s
-'''
-
-["PD:tso:ErrSyncMaxTS"]
-error = '''
-sync max ts failed, %s
-'''
-
 ["PD:tso:ErrUpdateTimestamp"]
 error = '''
 update timestamp failed, %s

diff --git a/pkg/errs/errno.go b/pkg/errs/errno.go
@@ -40,10 +40,8 @@ var (
 
 // tso errors
 var (
-	ErrSetLocalTSOConfig                = errors.Normalize("set local tso config failed, %s", errors.RFCCodeText("PD:tso:ErrSetLocalTSOConfig"))
 	ErrGetAllocator                     = errors.Normalize("get allocator failed, %s", errors.RFCCodeText("PD:tso:ErrGetAllocator"))
 	ErrGetLocalAllocator                = errors.Normalize("get local allocator failed, %s", errors.RFCCodeText("PD:tso:ErrGetLocalAllocator"))
-	ErrSyncMaxTS                        = errors.Normalize("sync max ts failed, %s", errors.RFCCodeText("PD:tso:ErrSyncMaxTS"))
 	ErrResetUserTimestamp               = errors.Normalize("reset user timestamp failed, %s", errors.RFCCodeText("PD:tso:ErrResetUserTimestamp"))
 	ErrGenerateTimestamp                = errors.Normalize("generate timestamp failed, %s", errors.RFCCodeText("PD:tso:ErrGenerateTimestamp"))
 	ErrUpdateTimestamp                  = errors.Normalize("update timestamp failed, %s", errors.RFCCodeText("PD:tso:ErrUpdateTimestamp"))