cri,nri: pass any linux scheduler attributes to plugins.

klihub · mikebrow · commit d56faf4261b5 · 2025-12-17T15:03:51.000-06:00
Signed-off-by: Krisztian Litkey &lt;krisztian.litkey@intel.com&gt;
diff --git a/internal/cri/nri/nri_api_linux.go b/internal/cri/nri/nri_api_linux.go
@@ -875,6 +875,13 @@ func (c *criContainer) GetIOPriority() *api.LinuxIOPriority {
 	return api.FromOCILinuxIOPriority(c.spec.Process.IOPriority)
 }
 
+func (c *criContainer) GetScheduler() *api.LinuxScheduler {
+	if c.spec.Process == nil || c.spec.Process.Scheduler == nil {
+		return nil
+	}
+	return api.FromOCILinuxScheduler(c.spec.Process.Scheduler)
+}
+
 func (c *criContainer) GetPid() uint32 {
 	return c.pid
 }
diff --git a/internal/nri/container.go b/internal/nri/container.go
@@ -46,6 +46,7 @@ type LinuxContainer interface {
 	GetOOMScoreAdj() *int
 	GetCgroupsPath() string
 	GetIOPriority() *nri.LinuxIOPriority
+	GetScheduler() *nri.LinuxScheduler
 }
 
 func commonContainerToNRI(ctr Container) *nri.Container {
diff --git a/internal/nri/container_linux.go b/internal/nri/container_linux.go
@@ -32,6 +32,7 @@ func containerToNRI(ctr Container) *nri.Container {
 		OomScoreAdj: nri.Int(lnxCtr.GetOOMScoreAdj()),
 		CgroupsPath: lnxCtr.GetCgroupsPath(),
 		IoPriority:  lnxCtr.GetIOPriority(),
+		Scheduler:   lnxCtr.GetScheduler(),
 	}
 	return nriCtr
 }

Original file line number	Diff line number	Diff line change
`@@ -875,6 +875,13 @@ func (c criContainer) GetIOPriority() api.LinuxIOPriority {`
`875`	`875`	`return api.FromOCILinuxIOPriority(c.spec.Process.IOPriority)`
`876`	`876`	`}`
`877`	`877`
	`878`	`+func (c criContainer) GetScheduler() api.LinuxScheduler {`
	`879`	`+ if c.spec.Process == nil \|\| c.spec.Process.Scheduler == nil {`
	`880`	`+ return nil`
	`881`	`+ }`
	`882`	`+ return api.FromOCILinuxScheduler(c.spec.Process.Scheduler)`
	`883`	`+}`
	`884`	`+`
`878`	`885`	`func (c *criContainer) GetPid() uint32 {`
`879`	`886`	`return c.pid`
`880`	`887`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ type LinuxContainer interface {`
`46`	`46`	`GetOOMScoreAdj() *int`
`47`	`47`	`GetCgroupsPath() string`
`48`	`48`	`GetIOPriority() *nri.LinuxIOPriority`
	`49`	`+ GetScheduler() *nri.LinuxScheduler`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`func commonContainerToNRI(ctr Container) *nri.Container {`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ func containerToNRI(ctr Container) *nri.Container {`
`32`	`32`	`OomScoreAdj: nri.Int(lnxCtr.GetOOMScoreAdj()),`
`33`	`33`	`CgroupsPath: lnxCtr.GetCgroupsPath(),`
`34`	`34`	`IoPriority: lnxCtr.GetIOPriority(),`
	`35`	`+ Scheduler: lnxCtr.GetScheduler(),`
`35`	`36`	`}`
`36`	`37`	`return nriCtr`
`37`	`38`	`}`