Merge pull request #4828 from marquiz/devel/runc-update-rdt-single-schema

lifubang · web-flow · commit e20b2c7126a2 · 2025-08-01T18:43:22.000+08:00
runc update: don't lose intelRdt state
diff --git a/update.go b/update.go
@@ -387,8 +387,12 @@ other options are ignored.
 					return err
 				}
 			}
-			config.IntelRdt.L3CacheSchema = l3CacheSchema
-			config.IntelRdt.MemBwSchema = memBwSchema
+			if l3CacheSchema != "" {
+				config.IntelRdt.L3CacheSchema = l3CacheSchema
+			}
+			if memBwSchema != "" {
+				config.IntelRdt.MemBwSchema = memBwSchema
+			}
 		}
 
 		// XXX(kolyshkin@): currently "runc update" is unable to change

Original file line number	Diff line number	Diff line change
`@@ -387,8 +387,12 @@ other options are ignored.`
`387`	`387`	`return err`
`388`	`388`	`}`
`389`	`389`	`}`
`390`		`- config.IntelRdt.L3CacheSchema = l3CacheSchema`
`391`		`- config.IntelRdt.MemBwSchema = memBwSchema`
	`390`	`+ if l3CacheSchema != "" {`
	`391`	`+ config.IntelRdt.L3CacheSchema = l3CacheSchema`
	`392`	`+ }`
	`393`	`+ if memBwSchema != "" {`
	`394`	`+ config.IntelRdt.MemBwSchema = memBwSchema`
	`395`	`+ }`
`392`	`396`	`}`
`393`	`397`
`394`	`398`	`// XXX(kolyshkin@): currently "runc update" is unable to change`