Fix bcachefs parsing (#789)

The earlier test fixture was a few months old.
Updated test fixtures and fs version parsing to match
latest bcachefs semantics.

Signed-off-by: Ananth Bhaskararaman <antsub@gmail.com>

Author: ananthb

bcachefs/get.go

@@ -339,7 +339,7 @@ func parseCounterFile(path string) (CounterStats, error) {
 	for scanner.Scan() {
 		line := scanner.Text()
 		if valueStr, ok := strings.CutPrefix(line, "since mount:"); ok {
-			value, err := strconv.ParseUint(strings.TrimSpace(valueStr), 10, 64)
+			value, err := parseHumanReadableBytes(valueStr)
 			if err != nil {
 				return CounterStats{}, err
 			}
@@ -348,7 +348,7 @@ func parseCounterFile(path string) (CounterStats, error) {
 			continue
 		}
 		if valueStr, ok := strings.CutPrefix(line, "since filesystem creation:"); ok {
-			value, err := strconv.ParseUint(strings.TrimSpace(valueStr), 10, 64)
+			value, err := parseHumanReadableBytes(valueStr)
 			if err != nil {
 				return CounterStats{}, err
 			}

bcachefs/get_test.go

@@ -13,7 +13,11 @@
 
 package bcachefs
 
-import "testing"
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
 
 func TestParseHumanReadableBytes(t *testing.T) {
 	tests := []struct {
@@ -85,3 +89,32 @@ func TestFSBcachefsStats(t *testing.T) {
 		t.Fatalf("unexpected io_done read btree: %d", dev.IODone["read"]["btree"])
 	}
 }
+
+func TestParseCounterFileHumanReadable(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "counter")
+	if err := os.WriteFile(path, []byte("since mount: 2.05G\nsince filesystem creation: 1.5T\n"), 0o644); err != nil {
+		t.Fatalf("write counter file: %v", err)
+	}
+
+	got, err := parseCounterFile(path)
+	if err != nil {
+		t.Fatalf("parseCounterFile error: %v", err)
+	}
+
+	wantMount, err := parseHumanReadableBytes("2.05G")
+	if err != nil {
+		t.Fatalf("parseHumanReadableBytes mount error: %v", err)
+	}
+	wantCreation, err := parseHumanReadableBytes("1.5T")
+	if err != nil {
+		t.Fatalf("parseHumanReadableBytes creation error: %v", err)
+	}
+
+	if got.SinceMount != wantMount {
+		t.Fatalf("since mount = %d, want %d", got.SinceMount, wantMount)
+	}
+	if got.SinceFilesystemCreation != wantCreation {
+		t.Fatalf("since filesystem creation = %d, want %d", got.SinceFilesystemCreation, wantCreation)
+	}
+}

testdata/fixtures.ttar

@@ -18232,72 +18232,61 @@ Lines: 1
 Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Path: fixtures/sys/fs/bcachefs/deadbeef-1234-5678-9012-abcdefabcdef/btree_write_stats
-Lines: 3
-                   nr        size
-initial:           19088     108k
-journal_reclaim:   541080    405
+Lines: 2
+type count size
+initial: 19088 1.0G
 Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Path: fixtures/sys/fs/bcachefs/deadbeef-1234-5678-9012-abcdefabcdef/compression_stats
-Lines: 3
-type                    compressed  uncompressed  average extent size
-lz4:                         19.3G         67.0G                 112k
-incompressible:               5.5G          5.5G                  22k
+Lines: 2
+compression        compressed      uncompressed    average
+lz4: 1.0G 2.0G 4k
 Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Directory: fixtures/sys/fs/bcachefs/deadbeef-1234-5678-9012-abcdefabcdef/counters
 Mode: 755
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Path: fixtures/sys/fs/bcachefs/deadbeef-1234-5678-9012-abcdefabcdef/counters/btree_node_read
 Lines: 2
-since mount:                  12345
-since filesystem creation:    67890
+since mount: 123
+since filesystem creation: 67890
 Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Directory: fixtures/sys/fs/bcachefs/deadbeef-1234-5678-9012-abcdefabcdef/dev-1
 Mode: 755
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Path: fixtures/sys/fs/bcachefs/deadbeef-1234-5678-9012-abcdefabcdef/dev-1/bucket_size
 Lines: 1
-1.0M
+128k
 Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Path: fixtures/sys/fs/bcachefs/deadbeef-1234-5678-9012-abcdefabcdef/dev-1/durability
 Lines: 1
-2
+1
 Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Path: fixtures/sys/fs/bcachefs/deadbeef-1234-5678-9012-abcdefabcdef/dev-1/io_done
-Lines: 11
+Lines: 6
 read:
-
-	sb          :     3989504
-	btree       :  4411097088
-	user        :5768222552064
-
+  btree: 4411097088
+  data: 0
 write:
-
-	sb          :    31417344
-	btree       :     1171456
-	user        : 39196815360
+  btree: 0
+  data: 0
 Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Path: fixtures/sys/fs/bcachefs/deadbeef-1234-5678-9012-abcdefabcdef/dev-1/io_errors
-Lines: 9
+Lines: 5
 IO errors since filesystem creation
-
-	read:    197346
-	write:   0
-	checksum:0
-
-IO errors since 8 y ago
-
-	read:    197346
+  read: 197346
+  write: 0
+IO errors since last mount
+  read: 0
 Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Path: fixtures/sys/fs/bcachefs/deadbeef-1234-5678-9012-abcdefabcdef/dev-1/label
 Lines: 1
-data0
+testdev
 Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Path: fixtures/sys/fs/bcachefs/deadbeef-1234-5678-9012-abcdefabcdef/dev-1/nbuckets
@@ -18312,7 +18301,7 @@ Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Path: fixtures/sys/fs/bcachefs/deadbeef-1234-5678-9012-abcdefabcdef/errors
 Lines: 1
-btree_node_read_err 5 1234567890
+btree_node_read_err 5 0
 Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Directory: fixtures/sys/fs/btrfs