Cleanup
Signed-off-by: Sasha Melentyev <sasha@melentyev.io>dependabot/go_modules/go.uber.org/atomic-1.10.0
parent
ee566c492b
commit
0f4d7a7483
|
@ -52,7 +52,6 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func bootstrap(cfg config.ServerConfig) (b *bootstrappedServer, err error) {
|
func bootstrap(cfg config.ServerConfig) (b *bootstrappedServer, err error) {
|
||||||
|
|
||||||
if cfg.MaxRequestBytes > recommendedMaxRequestBytes {
|
if cfg.MaxRequestBytes > recommendedMaxRequestBytes {
|
||||||
cfg.Logger.Warn(
|
cfg.Logger.Warn(
|
||||||
"exceeded recommended request limit",
|
"exceeded recommended request limit",
|
||||||
|
@ -82,9 +81,7 @@ func bootstrap(cfg config.ServerConfig) (b *bootstrappedServer, err error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
var (
|
var bwal *bootstrappedWAL
|
||||||
bwal *bootstrappedWAL
|
|
||||||
)
|
|
||||||
|
|
||||||
if haveWAL {
|
if haveWAL {
|
||||||
if err = fileutil.IsDirWriteable(cfg.WALDir()); err != nil {
|
if err = fileutil.IsDirWriteable(cfg.WALDir()); err != nil {
|
||||||
|
@ -105,8 +102,7 @@ func bootstrap(cfg config.ServerConfig) (b *bootstrappedServer, err error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
err = cluster.Finalize(cfg, s)
|
if err = cluster.Finalize(cfg, s); err != nil {
|
||||||
if err != nil {
|
|
||||||
backend.Close()
|
backend.Close()
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -223,9 +219,7 @@ func bootstrapBackend(cfg config.ServerConfig, haveWAL bool, st v2store.Store, s
|
||||||
cfg.Logger.Debug("restore consistentIndex", zap.Uint64("index", ci.ConsistentIndex()))
|
cfg.Logger.Debug("restore consistentIndex", zap.Uint64("index", ci.ConsistentIndex()))
|
||||||
|
|
||||||
// TODO(serathius): Implement schema setup in fresh storage
|
// TODO(serathius): Implement schema setup in fresh storage
|
||||||
var (
|
var snapshot *raftpb.Snapshot
|
||||||
snapshot *raftpb.Snapshot
|
|
||||||
)
|
|
||||||
if haveWAL {
|
if haveWAL {
|
||||||
snapshot, be, err = recoverSnapshot(cfg, st, be, beExist, beHooks, ci, ss)
|
snapshot, be, err = recoverSnapshot(cfg, st, be, beExist, beHooks, ci, ss)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -233,8 +227,7 @@ func bootstrapBackend(cfg config.ServerConfig, haveWAL bool, st v2store.Store, s
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if beExist {
|
if beExist {
|
||||||
err = schema.Validate(cfg.Logger, be.ReadTx())
|
if err = schema.Validate(cfg.Logger, be.ReadTx()); err != nil {
|
||||||
if err != nil {
|
|
||||||
cfg.Logger.Error("Failed to validate schema", zap.Error(err))
|
cfg.Logger.Error("Failed to validate schema", zap.Error(err))
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -394,7 +387,7 @@ func recoverSnapshot(cfg config.ServerConfig, st v2store.Store, be backend.Backe
|
||||||
// snapshot files can be orphaned if etcd crashes after writing them but before writing the corresponding
|
// snapshot files can be orphaned if etcd crashes after writing them but before writing the corresponding
|
||||||
// bwal log entries
|
// bwal log entries
|
||||||
snapshot, err := ss.LoadNewestAvailable(walSnaps)
|
snapshot, err := ss.LoadNewestAvailable(walSnaps)
|
||||||
if err != nil && err != snap.ErrNoSnapshot {
|
if err != nil && !errors.Is(err, snap.ErrNoSnapshot) {
|
||||||
return nil, be, err
|
return nil, be, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue