feat(os, peermem): ignore lsmod, system virt cmd timeouts (as non-actionable) (#531)

Author: gyuho

components/os/component_output.go

@@ -2,6 +2,7 @@ package os
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"runtime"
 	"sync"
@@ -266,7 +267,7 @@ func setDefaultPoller(cfg Config, eventBucket eventstore.Bucket) {
 		defaultPoller = query.New(
 			os_id.Name,
 			cfg.Query,
-			createGet(cfg, eventBucket),
+			createGet(eventBucket),
 			nil,
 		)
 	})
@@ -278,15 +279,19 @@ func getDefaultPoller() query.Poller {
 
 var getSystemdDetectVirtFunc = pkg_host.SystemdDetectVirt
 
-func createGet(cfg Config, eventBucket eventstore.Bucket) func(ctx context.Context) (_ any, e error) {
+func createGet(eventBucket eventstore.Bucket) func(ctx context.Context) (_ any, e error) {
 	return func(ctx context.Context) (_ any, e error) {
 		o := &Output{}
 
 		cctx, ccancel := context.WithTimeout(ctx, 15*time.Second)
 		virtEnv, err := getSystemdDetectVirtFunc(cctx)
 		ccancel()
 		if err != nil {
-			return nil, fmt.Errorf("failed to get virtualization environment using 'systemd-detect-virt': %w", err)
+			// ignore "context.DeadlineExceeded" since it's not a critical error and it's non-actionable
+			if !errors.Is(err, context.DeadlineExceeded) {
+				return nil, fmt.Errorf("failed to get virtualization environment using 'systemd-detect-virt': %w", err)
+			}
+			log.Logger.Warnw("failed to get virtualization environment using 'systemd-detect-virt'", "error", err)
 		}
 		o.VirtualizationEnvironment = virtEnv
 

components/os/component_output_test.go

@@ -18,13 +18,9 @@ func TestGet(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 0)
 	defer cancel()
 
-	getFunc := createGet(Config{}, nil)
+	getFunc := createGet(nil)
 	_, err := getFunc(ctx)
-	if err == nil {
-		t.Fatalf("expected error, got nil")
-	}
-	expectedError := "failed to get virtualization environment using 'systemd-detect-virt': context deadline exceeded"
-	if err.Error() != expectedError {
-		t.Fatalf("expected error: %s, got: %s", expectedError, err.Error())
+	if err != nil {
+		t.Fatalf("expected nil")
 	}
 }

pkg/nvidia-query/query.go

@@ -134,7 +134,12 @@ func Get(ctx context.Context, opts ...OpOption) (output any, err error) {
 	o.LsmodPeermem, err = peermem.CheckLsmodPeermemModule(cctx)
 	ccancel()
 	if err != nil {
-		o.LsmodPeermemErrors = append(o.LsmodPeermemErrors, err.Error())
+		// ignore "context.DeadlineExceeded" since it's not a critical error and it's non-actionable
+		if !errors.Is(err, context.DeadlineExceeded) {
+			o.LsmodPeermemErrors = append(o.LsmodPeermemErrors, err.Error())
+		} else {
+			log.Logger.Warnw("lsmod peermem check timed out", "error", err)
+		}
 	}
 
 	log.Logger.Infow("waiting for default nvml instance")