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

Persist member data with lazyfs enabled

Browse Source 
Discovered turning off LazyFS before creating the report might result in
empty server directory. This PR moves cluster shutdown to defer executed
after we generate report and copies the data from lazyfs directory.

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
This commit is contained in:
Marek Siarkowicz 2024-04-23 10:18:52 +02:00
parent ca39df1cd3
commit 9fcde37447
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robustness/main_test.go
View File

@ -70,7 +70,7 @@ func testRobustness(ctx context.Context, t *testing.T, lg *zap.Logger, s testSce
if err != nil {
t.Fatal(err)
}
defer r.Cluster.Close()
defer forcestopCluster(r.Cluster)
if s.failpoint == nil {
s.failpoint, err = failpoint.PickRandom(r.Cluster)
@ -95,7 +95,6 @@ func testRobustness(ctx context.Context, t *testing.T, lg *zap.Logger, s testSce
if err != nil {
t.Fatal(err)
}
forcestopCluster(r.Cluster)
watchProgressNotifyEnabled := r.Cluster.Cfg.ServerConfig.ExperimentalWatchProgressNotifyInterval != 0
validateGotAtLeastOneProgressNotify(t, r.Client, s.watch.requestProgress || watchProgressNotifyEnabled)

10
tests/robustness/report/report.go
View File

@ -81,8 +81,16 @@ func (r *TestReport) Report(t *testing.T, force bool) {
func persistMemberDataDir(t *testing.T, lg *zap.Logger, member e2e.EtcdProcess, path string) {
lg.Info("Saving member data dir", zap.String("member", member.Config().Name), zap.String("path", path))
err := os.Rename(member.Config().DataDirPath, path)
err := os.Rename(memberDataDir(member), path)
if err != nil {
t.Fatal(err)
}
}
func memberDataDir(member e2e.EtcdProcess) string {
lazyFS := member.LazyFS()
if lazyFS != nil {
return filepath.Join(lazyFS.LazyFSDir, "data")
}
return member.Config().DataDirPath
}

2
tests/robustness/report/wal.go
View File

@ -52,7 +52,7 @@ func LoadClusterPersistedRequests(lg *zap.Logger, path string) ([]model.EtcdRequ
func PersistedRequestsCluster(lg *zap.Logger, cluster *e2e.EtcdProcessCluster) ([]model.EtcdRequest, error) {
dataDirs := []string{}
for _, proc := range cluster.Procs {
dataDirs = append(dataDirs, proc.Config().DataDirPath)
dataDirs = append(dataDirs, memberDataDir(proc))
}
return PersistedRequestsDirs(lg, dataDirs)
}