From b6a2d2d48ac5fcd8d7914537f4fa9f0bc11d27b8 Mon Sep 17 00:00:00 2001 From: Luiz Gustavo Date: Tue, 8 Mar 2022 02:29:20 -0300 Subject: [PATCH] tools: Add -wal-dir flag on etcd-dump-logs to make it compatible with ETCD_WAL_DIR variable (#13672) --- tools/etcd-dump-logs/README.md | 4 +++- tools/etcd-dump-logs/main.go | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/etcd-dump-logs/README.md b/tools/etcd-dump-logs/README.md index b6edc3021..176d8a47d 100644 --- a/tools/etcd-dump-logs/README.md +++ b/tools/etcd-dump-logs/README.md @@ -13,7 +13,9 @@ Usage: - data_dir/member/wal/0000000000000000-0000000000000000.wal Flags: - + -wal-dir string + If set, dumps WAL from the informed path, rather than following the + standard 'data_dir/member/wal/' location -entry-type string If set, filters output by entry type. Must be one or more than one of: ConfigChange, Normal, Request, InternalRaftRequest, diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go index 899f40591..cda3dd5b8 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -45,6 +45,7 @@ const ( func main() { snapfile := flag.String("start-snap", "", "The base name of snapshot file to start dumping") + waldir := flag.String("wal-dir", "", "If set, dumps WAL from the informed path, rather than following the standard 'data_dir/member/wal/' location") index := flag.Uint64("start-index", 0, "The index to start dumping") // Default entry types are Normal and ConfigChange entrytype := flag.String("entry-type", defaultEntryTypes, `If set, filters output by entry type. Must be one or more than one of: @@ -103,7 +104,12 @@ and output a hex encoded line of binary for each input line`) fmt.Println("Start dumping log entries from snapshot.") } - w, err := wal.OpenForRead(zap.NewExample(), walDir(dataDir), walsnap) + wd := *waldir + if wd == "" { + wd = walDir(dataDir) + } + + w, err := wal.OpenForRead(zap.NewExample(), wd, walsnap) if err != nil { log.Fatalf("Failed opening WAL: %v", err) }