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

*: fix nakedret lint

Browse Source 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
This commit is contained in:
Wei Fu
2023-09-17 02:09:13 +00:00
parent fb8a315be6
commit e72c2c40d4
9 changed files with 60 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/etcdserver/bootstrap_test.go
View File

@ -216,27 +216,32 @@ func TestBootstrapBackend(t *testing.T) {
}
}
func createDataDir(t *testing.T) (dataDir string, err error) {
func createDataDir(t *testing.T) (string, error) {
var err error
// create the temporary data dir
dataDir = t.TempDir()
dataDir := t.TempDir()
// create ${dataDir}/member/snap
if err = os.MkdirAll(datadir.ToSnapDir(dataDir), 0700); err != nil {
return
return "", err
}
// create ${dataDir}/member/wal
err = os.MkdirAll(datadir.ToWalDir(dataDir), 0700)
if err != nil {
return "", err
}
return
return dataDir, nil
}
// prepare data for the test case
func prepareData(cfg config.ServerConfig) (err error) {
func prepareData(cfg config.ServerConfig) error {
var snapshotTerm, snapshotIndex uint64 = 2, 5
if err = createWALFileWithSnapshotRecord(cfg, snapshotTerm, snapshotIndex); err != nil {
return
if err := createWALFileWithSnapshotRecord(cfg, snapshotTerm, snapshotIndex); err != nil {
return err
}
return createSnapshotAndBackendDB(cfg, snapshotTerm, snapshotIndex)
@ -245,7 +250,7 @@ func prepareData(cfg config.ServerConfig) (err error) {
func createWALFileWithSnapshotRecord(cfg config.ServerConfig, snapshotTerm, snapshotIndex uint64) (err error) {
var w *wal.WAL
if w, err = wal.Create(cfg.Logger, cfg.WALDir(), []byte("somedata")); err != nil {
return
return err
}
defer func() {
@ -262,13 +267,15 @@ func createWALFileWithSnapshotRecord(cfg config.ServerConfig, snapshotTerm, snap
}
if err = w.SaveSnapshot(walSnap); err != nil {
return
return err
}
return w.Save(raftpb.HardState{Term: snapshotTerm, Vote: 3, Commit: snapshotIndex}, nil)
}
func createSnapshotAndBackendDB(cfg config.ServerConfig, snapshotTerm, snapshotIndex uint64) (err error) {
func createSnapshotAndBackendDB(cfg config.ServerConfig, snapshotTerm, snapshotIndex uint64) error {
var err error
confState := raftpb.ConfState{
Voters: []uint64{1, 2, 3},
}
@ -283,7 +290,7 @@ func createSnapshotAndBackendDB(cfg config.ServerConfig, snapshotTerm, snapshotI
Term: snapshotTerm,
},
}); err != nil {
return
return err
}
// create snapshot db file: "%016x.snap.db"
@ -292,11 +299,11 @@ func createSnapshotAndBackendDB(cfg config.ServerConfig, snapshotTerm, snapshotI
schema.UnsafeUpdateConsistentIndex(be.BatchTx(), snapshotIndex, snapshotTerm)
schema.MustUnsafeSaveConfStateToBackend(cfg.Logger, be.BatchTx(), &confState)
if err = be.Close(); err != nil {
return
return err
}
sdb := filepath.Join(cfg.SnapDir(), fmt.Sprintf("%016x.snap.db", snapshotIndex))
if err = os.Rename(cfg.BackendPath(), sdb); err != nil {
return
return err
}
// create backend db file