Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13771 from ahrtr/fix_fmt_error_log

Browse Source 
Fix some log format typos
This commit is contained in:
Sahdev Zala 2022-03-09 16:41:17 -05:00 committed by GitHub
commit 91f9ce9f5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcdutl/etcdutl/migrate_command.go
View File

@ -83,7 +83,7 @@ func (o *migrateOptions) Config() (*migrateConfig, error) {
} }
c.targetVersion, err = semver.NewVersion(o.targetVersion + ".0") c.targetVersion, err = semver.NewVersion(o.targetVersion + ".0")
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to parse target version: %w", err) return nil, fmt.Errorf("failed to parse target version: %v", err)
} }
if c.targetVersion.LessThan(schema.V3_5) { if c.targetVersion.LessThan(schema.V3_5) {
return nil, fmt.Errorf(`target version %q not supported. Minimal "3.5"`, storageVersionToString(c.targetVersion)) return nil, fmt.Errorf(`target version %q not supported. Minimal "3.5"`, storageVersionToString(c.targetVersion))

4
server/embed/config_logging.go
View File

@ -269,9 +269,9 @@ func setupLogRotation(logOutputs []string, logRotateConfigJSON string) error {
var syntaxError *json.SyntaxError var syntaxError *json.SyntaxError
switch { switch {
case errors.As(err, &syntaxError): case errors.As(err, &syntaxError):
return fmt.Errorf("improperly formatted log rotation config: %w", err) return fmt.Errorf("improperly formatted log rotation config: %v", err)
case errors.As(err, &unmarshalTypeError): case errors.As(err, &unmarshalTypeError):
return fmt.Errorf("invalid log rotation config: %w", err) return fmt.Errorf("invalid log rotation config: %v", err)
} }
} }
zap.RegisterSink("rotate", func(u *url.URL) (zap.Sink, error) { zap.RegisterSink("rotate", func(u *url.URL) (zap.Sink, error) {

4
server/storage/schema/membership.go
View File

@ -102,7 +102,7 @@ func (s *membershipBackend) readMembersFromBackend() (map[types.ID]*membership.M
return nil return nil
}) })
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("couldn't read members from backend: %w", err) return nil, nil, fmt.Errorf("couldn't read members from backend: %v", err)
} }
err = tx.UnsafeForEach(MembersRemoved, func(k, v []byte) error { err = tx.UnsafeForEach(MembersRemoved, func(k, v []byte) error {
@ -111,7 +111,7 @@ func (s *membershipBackend) readMembersFromBackend() (map[types.ID]*membership.M
return nil return nil
}) })
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("couldn't read members_removed from backend: %w", err) return nil, nil, fmt.Errorf("couldn't read members_removed from backend: %v", err)
} }
return members, removed, nil return members, removed, nil
} }

2
server/storage/schema/migration.go
View File

@ -60,7 +60,7 @@ func (p migrationPlan) unsafeExecute(lg *zap.Logger, tx backend.BatchTx) (err er
if err != nil { if err != nil {
return err return err
} }
lg.Info("upgraded storage version", zap.String("new-storage-version", s.target.String())) lg.Info("updated storage version", zap.String("new-storage-version", s.target.String()))
} }
return nil return nil
} }

2
server/storage/schema/schema.go
View File

@ -69,7 +69,7 @@ func Migrate(lg *zap.Logger, tx backend.BatchTx, w WALVersion, target semver.Ver
func UnsafeMigrate(lg *zap.Logger, tx backend.BatchTx, w WALVersion, target semver.Version) error { func UnsafeMigrate(lg *zap.Logger, tx backend.BatchTx, w WALVersion, target semver.Version) error {
current, err := UnsafeDetectSchemaVersion(lg, tx) current, err := UnsafeDetectSchemaVersion(lg, tx)
if err != nil { if err != nil {
return fmt.Errorf("cannot detect storage schema version: %w", err) return fmt.Errorf("cannot detect storage schema version: %v", err)
} }
plan, err := newPlan(lg, current, target) plan, err := newPlan(lg, current, target)
if err != nil { if err != nil {

2
tests/functional/tester/cluster.go
View File

@ -88,7 +88,7 @@ func NewCluster(lg *zap.Logger, fpath string) (*Cluster, error) {
var err error var err error
clus.agentConns[i], err = grpc.Dial(ap.AgentAddr, dialOpts...) clus.agentConns[i], err = grpc.Dial(ap.AgentAddr, dialOpts...)
if err != nil { if err != nil {
return nil, fmt.Errorf("cannot dial agent %v: %w", ap.AgentAddr, err) return nil, fmt.Errorf("cannot dial agent %v: %v", ap.AgentAddr, err)
} }
clus.agentClients[i] = rpcpb.NewTransportClient(clus.agentConns[i]) clus.agentClients[i] = rpcpb.NewTransportClient(clus.agentConns[i])
lg.Info("connected", zap.String("agent-address", ap.AgentAddr)) lg.Info("connected", zap.String("agent-address", ap.AgentAddr))