-
Notifications
You must be signed in to change notification settings - Fork 721
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
*: update the error dependency and do the corresponding changes (#2760)…
- Loading branch information
Showing
11 changed files
with
218 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| // Copyright 2020 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package errs | ||
|
|
||
| import "github.com/pingcap/errors" | ||
|
|
||
| // tso errors | ||
| var ( | ||
| ErrInvalidTimestamp = errors.Normalize("invalid timestamp", errors.RFCCodeText("PD:tso:ErrInvalidTimestamp")) | ||
| ErrLogicOverflow = errors.Normalize("logic part overflow", errors.RFCCodeText("PD:tso:ErrLogicOverflow")) | ||
| ErrIncorrectSystemTime = errors.Normalize("incorrect system time", errors.RFCCodeText("PD:tso:ErrIncorrectSystemTime")) | ||
| ) | ||
|
|
||
| // adapter errors | ||
| var ( | ||
| ErrStartDashboard = errors.Normalize("start dashboard failed", errors.RFCCodeText("PD:adapter:ErrStartDashboard")) | ||
| ErrStopDashboard = errors.Normalize("stop dashboard failed", errors.RFCCodeText("PD:adapter:ErrStopDashboard")) | ||
| ) | ||
|
|
||
| // member errors | ||
| var ( | ||
| ErretcdLeaderNotFound = errors.Normalize("etcd leader not found", errors.RFCCodeText("PD:member:ErretcdLeaderNotFound")) | ||
| ErrGetLeader = errors.Normalize("get leader failed", errors.RFCCodeText("PD:member:ErrGetLeader")) | ||
| ErrDeleteLeaderKey = errors.Normalize("delete leader key failed", errors.RFCCodeText("PD:member:ErrDeleteLeaderKey")) | ||
| ErrLoadLeaderPriority = errors.Normalize("load leader priority failed", errors.RFCCodeText("PD:member:ErrLoadLeaderPriority")) | ||
| ErrLoadetcdLeaderPriority = errors.Normalize("load etcd leader priority failed", errors.RFCCodeText("PD:member:ErrLoadetcdLeaderPriority")) | ||
| ErrTransferetcdLeader = errors.Normalize("transfer etcd leader failed", errors.RFCCodeText("PD:member:ErrTransferetcdLeader")) | ||
| ErrWatcherCancel = errors.Normalize("watcher canceled", errors.RFCCodeText("PD:member:ErrWatcherCancel")) | ||
| ErrMarshalLeader = errors.Normalize("marshal leader failed", errors.RFCCodeText("PD:member:ErrMarshalLeader")) | ||
| ) | ||
|
|
||
| // client errors | ||
| var ( | ||
| ErrCloseGRPCConn = errors.Normalize("close gRPC connection failed", errors.RFCCodeText("PD:client:ErrCloseGRPCConn")) | ||
| ErrUpdateLeader = errors.Normalize("update leader failed", errors.RFCCodeText("PD:client:ErrUpdateLeader")) | ||
| ErrCreateTSOStream = errors.Normalize("create TSO stream failed", errors.RFCCodeText("PD:client:ErrCreateTSOStream")) | ||
| ErrGetTSO = errors.Normalize("get TSO failed", errors.RFCCodeText("PD:client:ErrGetTSO")) | ||
| ErrGetClusterID = errors.Normalize("get cluster ID failed", errors.RFCCodeText("PD:client:ErrGetClusterID")) | ||
| ) | ||
|
|
||
| // placement errors | ||
| var ( | ||
| ErrRuleContent = errors.Normalize("invalid rule content, %s", errors.RFCCodeText("PD:placement:ErrRuleContent")) | ||
| ErrLoadRule = errors.Normalize("load rule failed", errors.RFCCodeText("PD:placement:ErrLoadRule")) | ||
| ErrLoadRuleGroup = errors.Normalize("load rule group failed", errors.RFCCodeText("PD:placement:ErrLoadRuleGroup")) | ||
| ErrBuildRuleList = errors.Normalize("build rule list failed, %s", errors.RFCCodeText("PD:placement:ErrBuildRuleList")) | ||
| ) | ||
|
|
||
| // kv errors | ||
| var ( | ||
| ErrEtcdKVSave = errors.Normalize("etcd KV save failed", errors.RFCCodeText("PD:kv:ErrEtcdKVSave")) | ||
| ErrEtcdKVRemove = errors.Normalize("etcd KV remove failed", errors.RFCCodeText("PD:kv:ErrEtcdKVRemove")) | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // Copyright 2020 TiKV Project Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package errs | ||
|
|
||
| import ( | ||
| "github.com/pingcap/errors" | ||
| "go.uber.org/zap" | ||
| "go.uber.org/zap/zapcore" | ||
| ) | ||
|
|
||
| // ZapError is used to make the log output eaiser. | ||
| func ZapError(err *errors.Error, causeError error) zap.Field { | ||
| e := err.Wrap(causeError).FastGenWithCause() | ||
| return zap.Field{Key: "error", Type: zapcore.ErrorType, Interface: e} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| // Copyright 2020 TiKV Project Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package errs | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "fmt" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| . "github.com/pingcap/check" | ||
| "github.com/pingcap/errors" | ||
| "github.com/pingcap/log" | ||
| "go.uber.org/zap" | ||
| ) | ||
|
|
||
| // testingWriter is a WriteSyncer that writes to the the messages. | ||
| type testingWriter struct { | ||
| messages []string | ||
| } | ||
|
|
||
| func newTestingWriter() *testingWriter { | ||
| return &testingWriter{} | ||
| } | ||
|
|
||
| func (w *testingWriter) Write(p []byte) (n int, err error) { | ||
| n = len(p) | ||
| p = bytes.TrimRight(p, "\n") | ||
| m := fmt.Sprintf("%s", p) | ||
| w.messages = append(w.messages, m) | ||
| return n, nil | ||
| } | ||
|
|
||
| func (w *testingWriter) Sync() error { | ||
| return nil | ||
| } | ||
|
|
||
| type verifyLogger struct { | ||
| *zap.Logger | ||
| w *testingWriter | ||
| } | ||
|
|
||
| func (logger *verifyLogger) Message() string { | ||
| if logger.w.messages == nil { | ||
| return "" | ||
| } | ||
| return logger.w.messages[len(logger.w.messages)-1] | ||
| } | ||
|
|
||
| func newZapTestLogger(cfg *log.Config, opts ...zap.Option) verifyLogger { | ||
| // TestingWriter is used to write to memory. | ||
| // Used in the verify logger. | ||
| writer := newTestingWriter() | ||
| lg, _, _ := log.InitLoggerWithWriteSyncer(cfg, writer, opts...) | ||
|
|
||
| return verifyLogger{ | ||
| Logger: lg, | ||
| w: writer, | ||
| } | ||
| } | ||
|
|
||
| func Test(t *testing.T) { | ||
| TestingT(t) | ||
| } | ||
|
|
||
| var _ = Suite(&testErrorSuite{}) | ||
|
|
||
| type testErrorSuite struct{} | ||
|
|
||
| func (s *testErrorSuite) TestError(c *C) { | ||
| conf := &log.Config{Level: "debug", File: log.FileLogConfig{}, DisableTimestamp: true} | ||
| lg := newZapTestLogger(conf) | ||
| log.ReplaceGlobals(lg.Logger, nil) | ||
|
|
||
| rfc := `[error="[PD:tso:ErrInvalidTimestamp]invalid timestamp"]` | ||
| log.Error("test", zap.Error(ErrInvalidTimestamp.FastGenByArgs())) | ||
| c.Assert(strings.Contains(lg.Message(), rfc), IsTrue) | ||
| err := errors.New("test error") | ||
| log.Error("test", ZapError(ErrInvalidTimestamp, err)) | ||
| rfc = `[error="[PD:tso:ErrInvalidTimestamp]test error"]` | ||
| fmt.Println(lg.Message()) | ||
| c.Assert(strings.Contains(lg.Message(), rfc), IsTrue) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.