mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server: Refactor databaseFileMissing function

Browse Source
This commit is contained in:
Marek Siarkowicz
2021-08-19 16:39:33 +02:00
parent 39f92a32ca
commit 35db0a5817
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/etcdserver/bootstrap.go
View File

@ -434,7 +434,7 @@ func (c *bootstrapedCluster) Finalize(cfg config.ServerConfig, s *bootstrappedSt
c.cl.SetBackend(schema.NewMembershipBackend(cfg.Logger, s.backend.be)) c.cl.SetBackend(schema.NewMembershipBackend(cfg.Logger, s.backend.be))
if s.wal.haveWAL { if s.wal.haveWAL {
c.cl.Recover(api.UpdateCapability) c.cl.Recover(api.UpdateCapability)
if c.cl.Version() != nil && !c.cl.Version().LessThan(semver.Version{Major: 3}) && !s.backend.beExist { if c.databaseFileMissing(s) {
bepath := cfg.BackendPath() bepath := cfg.BackendPath()
os.RemoveAll(bepath) os.RemoveAll(bepath)
return fmt.Errorf("database file (%v) of the backend is missing", bepath) return fmt.Errorf("database file (%v) of the backend is missing", bepath)
@ -443,6 +443,11 @@ func (c *bootstrapedCluster) Finalize(cfg config.ServerConfig, s *bootstrappedSt
return nil return nil
} }
func (c *bootstrapedCluster) databaseFileMissing(s *bootstrappedStorage) bool {
v3Cluster := c.cl.Version() != nil && !c.cl.Version().LessThan(semver.Version{Major: 3})
return v3Cluster && !s.backend.beExist
}
func bootstrapRaft(cfg config.ServerConfig, cluster *bootstrapedCluster, bwal *bootstrappedWAL) *bootstrappedRaft { func bootstrapRaft(cfg config.ServerConfig, cluster *bootstrapedCluster, bwal *bootstrappedWAL) *bootstrappedRaft {
switch { switch {
case !bwal.haveWAL && !cfg.NewCluster: case !bwal.haveWAL && !cfg.NewCluster: