From 8efc82d0b1a167830970135c78d173667080b116 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 28 Dec 2022 18:49:09 -0700 Subject: rebuildnodes: Support graceful shutdown --- cmd/btrfs-rec/inspect_rebuildnodes.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'cmd/btrfs-rec/inspect_rebuildnodes.go') diff --git a/cmd/btrfs-rec/inspect_rebuildnodes.go b/cmd/btrfs-rec/inspect_rebuildnodes.go index e61e6d2..9c86c3a 100644 --- a/cmd/btrfs-rec/inspect_rebuildnodes.go +++ b/cmd/btrfs-rec/inspect_rebuildnodes.go @@ -33,21 +33,31 @@ func init() { } dlog.Infof(ctx, "... done reading %q", args[0]) - rebuiltNodes, err := rebuildnodes.RebuildNodes(ctx, fs, nodeScanResults) + rebuilder, err := rebuildnodes.NewRebuilder(ctx, fs, nodeScanResults) if err != nil { return err } - dlog.Info(ctx, "Writing re-built nodes to stdout...") - if err := writeJSONFile(os.Stdout, rebuiltNodes, lowmemjson.ReEncoder{ + dlog.Info(ctx, "Rebuilding node tree...") + rebuildErr := rebuilder.Rebuild(ctx) + dst := os.Stdout + if rebuildErr != nil { + dst = os.Stderr + dlog.Errorf(ctx, "rebuild error: %v", rebuildErr) + } + dlog.Infof(ctx, "Writing re-built nodes to %s...", dst.Name()) + if err := writeJSONFile(dst, rebuilder.ListRoots(), lowmemjson.ReEncoder{ Indent: "\t", ForceTrailingNewlines: true, }); err != nil { + if rebuildErr != nil { + return rebuildErr + } return err } dlog.Info(ctx, "... done writing") - return nil + return rebuildErr }, }) } -- cgit v1.2.3-2-g168b From 6ce1332d3cac5b74d2f049861f04cc2fa282d747 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 29 Dec 2022 23:53:55 -0700 Subject: cmd/btrfs-rec inspect rebuild-nodes: Optimize memory use --- cmd/btrfs-rec/inspect_rebuildnodes.go | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'cmd/btrfs-rec/inspect_rebuildnodes.go') diff --git a/cmd/btrfs-rec/inspect_rebuildnodes.go b/cmd/btrfs-rec/inspect_rebuildnodes.go index 9c86c3a..d813f36 100644 --- a/cmd/btrfs-rec/inspect_rebuildnodes.go +++ b/cmd/btrfs-rec/inspect_rebuildnodes.go @@ -5,7 +5,10 @@ package main import ( + "context" "os" + "runtime" + "time" "git.lukeshu.com/go/lowmemjson" "github.com/datawire/dlib/dlog" @@ -15,6 +18,7 @@ import ( "git.lukeshu.com/btrfs-progs-ng/lib/btrfs" "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect" "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect/rebuildnodes" + "git.lukeshu.com/btrfs-progs-ng/lib/textui" ) func init() { @@ -26,18 +30,25 @@ func init() { RunE: func(fs *btrfs.FS, cmd *cobra.Command, args []string) error { ctx := cmd.Context() - dlog.Infof(ctx, "Reading %q...", args[0]) - nodeScanResults, err := readJSONFile[btrfsinspect.ScanDevicesResult](ctx, args[0]) - if err != nil { - return err - } - dlog.Infof(ctx, "... done reading %q", args[0]) + // This is wrapped in a func in order to *ensure* that `nodeScanResults` goes out of scope once + // `rebuilder` has been created. + rebuilder, err := func(ctx context.Context) (rebuildnodes.Rebuilder, error) { + dlog.Infof(ctx, "Reading %q...", args[0]) + nodeScanResults, err := readJSONFile[btrfsinspect.ScanDevicesResult](ctx, args[0]) + if err != nil { + return nil, err + } + dlog.Infof(ctx, "... done reading %q", args[0]) - rebuilder, err := rebuildnodes.NewRebuilder(ctx, fs, nodeScanResults) + return rebuildnodes.NewRebuilder(ctx, fs, nodeScanResults) + }(ctx) if err != nil { return err } + runtime.GC() + time.Sleep(textui.LiveMemUseUpdateInterval) // let the logs reflect that GC right away + dlog.Info(ctx, "Rebuilding node tree...") rebuildErr := rebuilder.Rebuild(ctx) dst := os.Stdout -- cgit v1.2.3-2-g168b