server.go (etcd-3.5.5) | : | server.go (etcd-3.5.6) | ||
---|---|---|---|---|
skipping to change at line 352 | skipping to change at line 352 | |||
if cfg.MaxRequestBytes > recommendedMaxRequestBytes { | if cfg.MaxRequestBytes > recommendedMaxRequestBytes { | |||
cfg.Logger.Warn( | cfg.Logger.Warn( | |||
"exceeded recommended request limit", | "exceeded recommended request limit", | |||
zap.Uint("max-request-bytes", cfg.MaxRequestBytes), | zap.Uint("max-request-bytes", cfg.MaxRequestBytes), | |||
zap.String("max-request-size", humanize.Bytes(uint64(cfg. MaxRequestBytes))), | zap.String("max-request-size", humanize.Bytes(uint64(cfg. MaxRequestBytes))), | |||
zap.Int("recommended-request-bytes", recommendedMaxReques tBytes), | zap.Int("recommended-request-bytes", recommendedMaxReques tBytes), | |||
zap.String("recommended-request-size", recommendedMaxRequ estBytesString), | zap.String("recommended-request-size", recommendedMaxRequ estBytesString), | |||
) | ) | |||
} | } | |||
if terr := fileutil.TouchDirAll(cfg.DataDir); terr != nil { | if terr := fileutil.TouchDirAll(cfg.Logger, cfg.DataDir); terr != nil { | |||
return nil, fmt.Errorf("cannot access data directory: %v", terr) | return nil, fmt.Errorf("cannot access data directory: %v", terr) | |||
} | } | |||
haveWAL := wal.Exist(cfg.WALDir()) | haveWAL := wal.Exist(cfg.WALDir()) | |||
if err = fileutil.TouchDirAll(cfg.SnapDir()); err != nil { | if err = fileutil.TouchDirAll(cfg.Logger, cfg.SnapDir()); err != nil { | |||
cfg.Logger.Fatal( | cfg.Logger.Fatal( | |||
"failed to create snapshot directory", | "failed to create snapshot directory", | |||
zap.String("path", cfg.SnapDir()), | zap.String("path", cfg.SnapDir()), | |||
zap.Error(err), | zap.Error(err), | |||
) | ) | |||
} | } | |||
if err = fileutil.RemoveMatchFile(cfg.Logger, cfg.SnapDir(), func(fileNam e string) bool { | if err = fileutil.RemoveMatchFile(cfg.Logger, cfg.SnapDir(), func(fileNam e string) bool { | |||
return strings.HasPrefix(fileName, "tmp") | return strings.HasPrefix(fileName, "tmp") | |||
}); err != nil { | }); err != nil { | |||
skipping to change at line 551 | skipping to change at line 551 | |||
cl.Recover(api.UpdateCapability) | cl.Recover(api.UpdateCapability) | |||
if cl.Version() != nil && !cl.Version().LessThan(semver.Version{M ajor: 3}) && !beExist { | if cl.Version() != nil && !cl.Version().LessThan(semver.Version{M ajor: 3}) && !beExist { | |||
os.RemoveAll(bepath) | os.RemoveAll(bepath) | |||
return nil, fmt.Errorf("database file (%v) of the backend is missing", bepath) | return nil, fmt.Errorf("database file (%v) of the backend is missing", bepath) | |||
} | } | |||
default: | default: | |||
return nil, fmt.Errorf("unsupported bootstrap config") | return nil, fmt.Errorf("unsupported bootstrap config") | |||
} | } | |||
if terr := fileutil.TouchDirAll(cfg.MemberDir()); terr != nil { | if terr := fileutil.TouchDirAll(cfg.Logger, cfg.MemberDir()); terr != nil { | |||
return nil, fmt.Errorf("cannot access member directory: %v", terr ) | return nil, fmt.Errorf("cannot access member directory: %v", terr ) | |||
} | } | |||
sstats := stats.NewServerStats(cfg.Name, id.String()) | sstats := stats.NewServerStats(cfg.Name, id.String()) | |||
lstats := stats.NewLeaderStats(cfg.Logger, id.String()) | lstats := stats.NewLeaderStats(cfg.Logger, id.String()) | |||
heartbeat := time.Duration(cfg.TickMs) * time.Millisecond | heartbeat := time.Duration(cfg.TickMs) * time.Millisecond | |||
srv = &EtcdServer{ | srv = &EtcdServer{ | |||
readych: make(chan struct{}), | readych: make(chan struct{}), | |||
Cfg: cfg, | Cfg: cfg, | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added |