fix: avoid to unlock unlocked mutex durning setup

Signed-off-by: niejiangang <niejiangang@harmonycloud.cn>
KindlingProject · Nov 27, 2023 · 11e51b6 · 11e51b6
1 parent 9a6f9a0
commit 11e51b6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/collector/pkg/metadata/kubernetes/initk8s.go b/collector/pkg/metadata/kubernetes/initk8s.go
@@ -226,3 +226,17 @@ func RUnlockMetadataCache() {
 	MetaDataCache.pMut.RUnlock()
 	MetaDataCache.cMut.RUnlock()
 }
+
+func RLockForSetup() {
+	MetaDataCache.cMut.RLock()
+	MetaDataCache.pMut.RLock()
+	MetaDataCache.sMut.RLock()
+	podDeleteQueueMut.Lock()
+}
+
+func RUnlockForSetup() {
+	podDeleteQueueMut.Unlock()
+	MetaDataCache.sMut.RUnlock()
+	MetaDataCache.pMut.RUnlock()
+	MetaDataCache.cMut.RUnlock()
+}
diff --git a/collector/pkg/metadata/kubernetes/k8scache.go b/collector/pkg/metadata/kubernetes/k8scache.go
@@ -292,8 +292,8 @@ func (c *K8sMetaDataCache) GetNodeNameByIp(ip string) (string, bool) {
 }
 
 func SetupCache(cache *K8sMetaDataCache, nodeMap *NodeMap, serviceMap *ServiceMap, rsMap *ReplicaSetMap) {
-	RLockMetadataCache()
-	defer RUnlockMetadataCache()
+	RLockDurningSetup()
+	defer RUnlockDurningSetup()
 	if cache != nil {
 		if cache.ContainerIdInfo != nil {
 			// Recalculate local cacheMap