AssumedPodAffinityInfo is not thread safe

kubewharf · Nov 30, 2023 · 0da227a · 0da227a
1 parent 0c0e5c6
commit 0da227a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -143,7 +143,7 @@ require (
 )
 
 replace (
-	github.com/kubewharf/katalyst-api => github.com/yanxiaoqi932/katalyst-api v0.0.0-20231107051637-650dde637f00
+	github.com/kubewharf/katalyst-api => github.com/yanxiaoqi932/katalyst-api v0.0.0-20231128113809-3b13458a1615
 	k8s.io/api => k8s.io/api v0.24.6
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.6
 	k8s.io/apimachinery => k8s.io/apimachinery v0.24.6

diff --git a/go.sum b/go.sum
@@ -543,8 +543,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kubewharf/katalyst-api v0.1.17-0.20231123025708-2d67eae84665 h1:ftUQ/H9ZEmCGbHSrHHu7NCaitBwCtPMagdewzH501Cg=
-github.com/kubewharf/katalyst-api v0.1.17-0.20231123025708-2d67eae84665/go.mod h1:iVILS5UL5PRtkUPH2Iu1K/gFGTPMNItnth5fmQ80VGE=
 github.com/kubewharf/kubelet v1.24.6-kubewharf.7 h1:zex5NjgWh3b+fk8sey5Hp/hOVoSKdqf4mJu8MeE8T4k=
 github.com/kubewharf/kubelet v1.24.6-kubewharf.7/go.mod h1:MxbSZUx3wXztFneeelwWWlX7NAAStJ6expqq7gY2J3c=
 github.com/kyoh86/exportloopref v0.1.7/go.mod h1:h1rDl2Kdj97+Kwh4gdz3ujE7XHmH51Q0lUiZ1z4NLj8=
@@ -872,8 +870,8 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yanxiaoqi932/katalyst-api v0.0.0-20231107051637-650dde637f00 h1:PlpOajXf9+kPvZkXXpC5hl/WdwptOGt45Q+s+dBS+0w=
-github.com/yanxiaoqi932/katalyst-api v0.0.0-20231107051637-650dde637f00/go.mod h1:iVILS5UL5PRtkUPH2Iu1K/gFGTPMNItnth5fmQ80VGE=
+github.com/yanxiaoqi932/katalyst-api v0.0.0-20231128113809-3b13458a1615 h1:zUysymZmv9ZjHzcFWYVnQ2W3tI3ApxS1qDSUXGV8foI=
+github.com/yanxiaoqi932/katalyst-api v0.0.0-20231128113809-3b13458a1615/go.mod h1:iVILS5UL5PRtkUPH2Iu1K/gFGTPMNItnth5fmQ80VGE=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

diff --git a/pkg/scheduler/cache/nodeinfo.go b/pkg/scheduler/cache/nodeinfo.go
@@ -245,7 +245,18 @@ func (n *NodeInfo) GetResourceTopologyCopy(filterFn podFilter) *ResourceTopology
 func (n *NodeInfo) GetAssumedPodAffinityInfo() AssumedPodAffinityInfo {
 	n.Mutex.RLock()
 	defer n.Mutex.RUnlock()
-	return n.AssumedPodAffinityInfo
+	// Perform a deep copy of n.AssumedPodAffinityInfo
+	var copyAssumedPodAffinityInfo = make(AssumedPodAffinityInfo)
+	for key, value := range n.AssumedPodAffinityInfo {
+		copyAssumedPodAffinityInfo[key] = struct {
+			Labels      map[string]string
+			Annotations map[string]string
+		}{
+			Labels:      value.Labels,
+			Annotations: value.Annotations,
+		}
+	}
+	return copyAssumedPodAffinityInfo
 }
 
 func (n *NodeInfo) AddAssumedPodAffinity(pod *v1.Pod) {