Fallback to standard CDI modifier when creation of automatic CDI modifier fails

cdesiniotis · cdesiniotis · commit 32c3bd1ded88 · 2023-12-06T09:02:19.000-08:00
Signed-off-by: Christopher Desiniotis &lt;cdesiniotis@nvidia.com&gt;
diff --git a/internal/modifier/cdi.go b/internal/modifier/cdi.go
@@ -50,7 +50,12 @@ func NewCDIModifier(logger logger.Interface, cfg *config.Config, ociSpec oci.Spe
 		return nil, fmt.Errorf("requesting a CDI device with vendor 'runtime.nvidia.com' is not supported when requesting other CDI devices")
 	}
 	if len(automaticDevices) > 0 {
-		return newAutomaticCDISpecModifier(logger, cfg, automaticDevices)
+		automaticModifier, err := newAutomaticCDISpecModifier(logger, cfg, automaticDevices)
+		if err == nil {
+			return automaticModifier, nil
+		}
+		logger.Warningf("Failed to create the automatic CDI modifier: %w", err)
+		logger.Debugf("Falling back to the standard CDI modifier")
 	}
 
 	return cdi.New(

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,12 @@ func NewCDIModifier(logger logger.Interface, cfg *config.Config, ociSpec oci.Spe`
`50`	`50`	`return nil, fmt.Errorf("requesting a CDI device with vendor 'runtime.nvidia.com' is not supported when requesting other CDI devices")`
`51`	`51`	`}`
`52`	`52`	`if len(automaticDevices) > 0 {`
`53`		`- return newAutomaticCDISpecModifier(logger, cfg, automaticDevices)`
	`53`	`+ automaticModifier, err := newAutomaticCDISpecModifier(logger, cfg, automaticDevices)`
	`54`	`+ if err == nil {`
	`55`	`+ return automaticModifier, nil`
	`56`	`+ }`
	`57`	`+ logger.Warningf("Failed to create the automatic CDI modifier: %w", err)`
	`58`	`+ logger.Debugf("Falling back to the standard CDI modifier")`
`54`	`59`	`}`
`55`	`60`
`56`	`61`	`return cdi.New(`