diff --git a/source/memory/memory.go b/source/memory/memory.go index 5c4ce9f610..ab9bc02ed6 100644 --- a/source/memory/memory.go +++ b/source/memory/memory.go @@ -131,7 +131,7 @@ func (s *memorySource) GetFeatures() *nfdv1alpha1.Features { // detectSwap detects Swap node information func detectSwap() (map[string]string, error) { procBasePath := hostpath.ProcDir.Path("swaps") - lines, err := getNumberOfLinesFromFile(procBasePath) + lines, err := getNumberOfNonEmptyLinesFromFile(procBasePath) if err != nil { return nil, fmt.Errorf("failed to read swaps file: %w", err) } @@ -195,12 +195,18 @@ func readNdDeviceInfo(path string) nfdv1alpha1.InstanceFeature { return *nfdv1alpha1.NewInstanceFeature(attrs) } -func getNumberOfLinesFromFile(path string) (int, error) { +func getNumberOfNonEmptyLinesFromFile(path string) (int, error) { data, err := os.ReadFile(path) if err != nil { return 0, err } - return len(strings.Split(string(data), "\n")), nil + length := 0 + for _, line := range strings.Split(string(data), "\n") { + if strings.TrimSpace(line) != "" { + length++ + } + } + return length, nil } func init() { diff --git a/source/memory/memory_test.go b/source/memory/memory_test.go index c5edc1b36b..535decb03a 100644 --- a/source/memory/memory_test.go +++ b/source/memory/memory_test.go @@ -54,7 +54,7 @@ func TestGetNumberofLinesFromFile(t *testing.T) { }, } for _, tc := range tc { - actual, err := getNumberOfLinesFromFile(tc.path) + actual, err := getNumberOfNonEmptyLinesFromFile(tc.path) if tc.expectErr { assert.NotNil(t, err, "should get an error") } diff --git a/source/memory/testdata/noswap b/source/memory/testdata/noswap index 37a6cc05c3..613dce24e3 100644 --- a/source/memory/testdata/noswap +++ b/source/memory/testdata/noswap @@ -1 +1 @@ -Filename Type Size Used Priority \ No newline at end of file +Filename Type Size Used Priority diff --git a/source/memory/testdata/swap b/source/memory/testdata/swap index 6ffbd40704..8eb6734444 100644 --- a/source/memory/testdata/swap +++ b/source/memory/testdata/swap @@ -1,2 +1,2 @@ Filename Type Size Used Priority -dummyfile partition 65555 0 -1 \ No newline at end of file +dummyfile partition 65555 0 -1