Merge pull request #4833 from marquiz/release-1.3

kolyshkin · web-flow · commit 81693c22ec27 · 2025-08-04T16:54:03.000-07:00
[release-1.3] runc update: don't lose intelRdt state
diff --git a/update.go b/update.go
@@ -367,8 +367,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
`@@ -367,8 +367,12 @@ other options are ignored.`
`367`	`367`	`return err`
`368`	`368`	`}`
`369`	`369`	`}`
`370`		`- config.IntelRdt.L3CacheSchema = l3CacheSchema`
`371`		`- config.IntelRdt.MemBwSchema = memBwSchema`
	`370`	`+ if l3CacheSchema != "" {`
	`371`	`+ config.IntelRdt.L3CacheSchema = l3CacheSchema`
	`372`	`+ }`
	`373`	`+ if memBwSchema != "" {`
	`374`	`+ config.IntelRdt.MemBwSchema = memBwSchema`
	`375`	`+ }`
`372`	`376`	`}`
`373`	`377`
`374`	`378`	`// XXX(kolyshkin@): currently "runc update" is unable to change`