github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add check for etcd-snapshot-dir and fix panic in Walk 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 6ec1926f88)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/9470/head
Brad Davidson 2024-01-30 22:44:58 +00:00 committed by Brad Davidson
parent bb26d8cf8e
commit 10dfb09383
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/etcd/snapshot.go
View File

@ -245,7 +245,13 @@ func (e *ETCD) Snapshot(ctx context.Context) error {
snapshotDir, err := snapshotDir(e.config, true) snapshotDir, err := snapshotDir(e.config, true)
if err != nil { if err != nil {
return errors.Wrap(err, "failed to get the snapshot dir") return errors.Wrap(err, "failed to get etcd-snapshot-dir")
}
if info, err := os.Stat(snapshotDir); err != nil {
return errors.Wrapf(err, "failed to stat etcd-snapshot-dir %s", snapshotDir)
} else if !info.IsDir() {
return fmt.Errorf("etcd-snapshot-dir %s is not a directory", snapshotDir)
} }
cfg, err := getClientConfig(ctx, e.config) cfg, err := getClientConfig(ctx, e.config)
@ -436,7 +442,7 @@ func (e *ETCD) listLocalSnapshots() (map[string]snapshotFile, error) {
} }
if err := filepath.Walk(snapshotDir, func(path string, file os.FileInfo, err error) error { if err := filepath.Walk(snapshotDir, func(path string, file os.FileInfo, err error) error {
if file.IsDir() || err != nil { if err != nil || file.IsDir() {
return err return err
} }