investigate devicemapping failures

coderbirju · coderbirju · commit e725123d2e0a · 2025-02-03T20:43:31.000Z
Signed-off-by: Arjun Raja Yogidas &lt;arjunry@amazon.com&gt;
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -33,9 +33,9 @@ jobs:
           - runner: ubuntu-24.04
             containerd: v2.0.2
             arch: amd64
-          - runner: arm64-8core-32gb
-            containerd: v2.0.2
-            arch: arm64
+          # - runner: arm64-8core-32gb
+          #   containerd: v2.0.2
+          #   arch: arm64
     env:
       CONTAINERD_VERSION: "${{ matrix.containerd }}"
       ARCH: "${{ matrix.arch }}"
@@ -108,18 +108,18 @@ jobs:
             containerd: v1.6.36
             runner: "ubuntu-20.04"
             arch: amd64
-          - ubuntu: 22.04
-            containerd: v1.7.25
-            runner: "ubuntu-22.04"
-            arch: amd64
+          # - ubuntu: 22.04
+          #   containerd: v1.7.25
+          #   runner: "ubuntu-22.04"
+          #   arch: amd64
           - ubuntu: 24.04
             containerd: v2.0.2
             runner: "ubuntu-24.04"
             arch: amd64
-          - ubuntu: 24.04
-            containerd: v2.0.2
-            runner: arm64-8core-32gb
-            arch: arm64
+          # - ubuntu: 24.04
+          #   containerd: v2.0.2
+          #   runner: arm64-8core-32gb
+          #   arch: arm64
     env:
       CONTAINERD_VERSION: "${{ matrix.containerd }}"
       ARCH: "${{ matrix.arch }}"
@@ -233,21 +233,21 @@ jobs:
             rootlesskit: v1.1.1  # Deprecated
             target: rootless
             arch: amd64
-          - ubuntu: 22.04
-            containerd: v1.7.25
-            rootlesskit: v2.3.2
-            target: rootless
-            arch: amd64
-          - ubuntu: 24.04
-            containerd: v2.0.2
-            rootlesskit: v2.3.2
-            target: rootless
-            arch: amd64
-          - ubuntu: 24.04
-            containerd: v1.7.25
-            rootlesskit: v2.3.2
-            target: rootless-port-slirp4netns
-            arch: amd64
+          # - ubuntu: 22.04
+          #   containerd: v1.7.25
+          #   rootlesskit: v2.3.2
+          #   target: rootless
+          #   arch: amd64
+          # - ubuntu: 24.04
+          #   containerd: v2.0.2
+          #   rootlesskit: v2.3.2
+          #   target: rootless
+          #   arch: amd64
+          # - ubuntu: 24.04
+          #   containerd: v1.7.25
+          #   rootlesskit: v2.3.2
+          #   target: rootless-port-slirp4netns
+          #   arch: amd64
     env:
       CONTAINERD_VERSION: "${{ matrix.containerd }}"
       ARCH: "${{ matrix.arch }}"
diff --git a/pkg/cmd/container/create.go b/pkg/cmd/container/create.go
@@ -118,6 +118,10 @@ func Create(ctx context.Context, client *containerd.Client, args []string, netMa
 		oci.WithDefaultSpec(),
 	)
 
+	if options.Device != nil {
+		log.L.Warnf("(TestContainerInspectDevices INFO) Calling setPlatformOptions with options.device = %v", options.Device)
+	}
+
 	platformOpts, err := setPlatformOptions(ctx, client, id, netManager.NetworkOptions().UTSNamespace, &internalLabels, options)
 	if err != nil {
 		return nil, generateRemoveStateDirFunc(ctx, id, internalLabels), err
@@ -772,7 +776,9 @@ func withInternalLabels(internalLabels internalLabels) (containerd.NewContainerO
 		dnsSettings.DNSResolvConfOptions = internalLabels.dnsResolvConfOptions
 	}
 
+	log.L.Warnf("(TestContainerInspectDevices INFO) before len(internalLabels.deviceMapping) = %v", len(internalLabels.deviceMapping))
 	if len(internalLabels.deviceMapping) > 0 {
+		log.L.Warn("(TestContainerInspectDevices INFO) pulling deviceMapping from internal labels ")
 		hostConfigLabel.Devices = append(hostConfigLabel.Devices, internalLabels.deviceMapping...)
 	}
 
diff --git a/pkg/cmd/container/run_cgroup_linux.go b/pkg/cmd/container/run_cgroup_linux.go
@@ -201,6 +201,7 @@ func generateCgroupOpts(id string, options types.ContainerCreateOptions, interna
 		return nil, fmt.Errorf("unknown cgroupns mode %q", options.Cgroupns)
 	}
 
+	log.L.Warn("(TestContainerInspectDevices INFO) before for loop")
 	for _, f := range options.Device {
 		devPath, conPath, mode, err := ParseDevice(f)
 		if err != nil {
@@ -212,6 +213,7 @@ func generateCgroupOpts(id string, options types.ContainerCreateOptions, interna
 		deviceMap.PathInContainer = conPath
 		deviceMap.CgroupPermissions = mode
 		internalLabels.deviceMapping = append(internalLabels.deviceMapping, deviceMap)
+		log.L.Warnf("(TestContainerInspectDevices INFO) setting the device mapping info %v", deviceMap)
 	}
 
 	return opts, nil
diff --git a/pkg/cmd/container/run_linux.go b/pkg/cmd/container/run_linux.go
@@ -56,6 +56,7 @@ func setPlatformOptions(ctx context.Context, client *containerd.Client, id, uts
 			{Type: "cgroup", Source: "cgroup", Destination: "/sys/fs/cgroup", Options: []string{"ro", "nosuid", "noexec", "nodev"}},
 		}))
 
+	log.L.Warnf("(TestContainerInspectDevices INFO) Calling generateCgroupOpts with options.device = %v", options.Device)
 	cgOpts, err := generateCgroupOpts(id, options, internalLabels)
 	if err != nil {
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,10 @@ func Create(ctx context.Context, client *containerd.Client, args []string, netMa`
`118`	`118`	`oci.WithDefaultSpec(),`
`119`	`119`	`)`
`120`	`120`
	`121`	`+ if options.Device != nil {`
	`122`	`+ log.L.Warnf("(TestContainerInspectDevices INFO) Calling setPlatformOptions with options.device = %v", options.Device)`
	`123`	`+ }`
	`124`	`+`
`121`	`125`	`platformOpts, err := setPlatformOptions(ctx, client, id, netManager.NetworkOptions().UTSNamespace, &internalLabels, options)`
`122`	`126`	`if err != nil {`
`123`	`127`	`return nil, generateRemoveStateDirFunc(ctx, id, internalLabels), err`
`@@ -772,7 +776,9 @@ func withInternalLabels(internalLabels internalLabels) (containerd.NewContainerO`
`772`	`776`	`dnsSettings.DNSResolvConfOptions = internalLabels.dnsResolvConfOptions`
`773`	`777`	`}`
`774`	`778`
	`779`	`+ log.L.Warnf("(TestContainerInspectDevices INFO) before len(internalLabels.deviceMapping) = %v", len(internalLabels.deviceMapping))`
`775`	`780`	`if len(internalLabels.deviceMapping) > 0 {`
	`781`	`+ log.L.Warn("(TestContainerInspectDevices INFO) pulling deviceMapping from internal labels ")`
`776`	`782`	`hostConfigLabel.Devices = append(hostConfigLabel.Devices, internalLabels.deviceMapping...)`
`777`	`783`	`}`
`778`	`784`
Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,7 @@ func generateCgroupOpts(id string, options types.ContainerCreateOptions, interna`
`201`	`201`	`return nil, fmt.Errorf("unknown cgroupns mode %q", options.Cgroupns)`
`202`	`202`	`}`
`203`	`203`
	`204`	`+ log.L.Warn("(TestContainerInspectDevices INFO) before for loop")`
`204`	`205`	`for _, f := range options.Device {`
`205`	`206`	`devPath, conPath, mode, err := ParseDevice(f)`
`206`	`207`	`if err != nil {`
`@@ -212,6 +213,7 @@ func generateCgroupOpts(id string, options types.ContainerCreateOptions, interna`
`212`	`213`	`deviceMap.PathInContainer = conPath`
`213`	`214`	`deviceMap.CgroupPermissions = mode`
`214`	`215`	`internalLabels.deviceMapping = append(internalLabels.deviceMapping, deviceMap)`
	`216`	`+ log.L.Warnf("(TestContainerInspectDevices INFO) setting the device mapping info %v", deviceMap)`
`215`	`217`	`}`
`216`	`218`
`217`	`219`	`return opts, nil`