Skip to content

fix writeLock between readLock caused dead lock #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AnnaYue merged 1 commit into from
Apr 29, 2025
Merged

fix writeLock between readLock caused dead lock #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions resourcetopo/node_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,6 @@ func (n *nodeInfo) postOrderRelationDeleted(postNode *nodeInfo) {

// propagateNodeChange call node event handler for existed relations.
func (n *nodeInfo) propagateNodeChange(m *manager) {
n.lock.RLock()
defer n.lock.RUnlock()

noticePreOrder := func(preOrder *nodeInfo) {
if _, ok := preOrder.storageRef.postNoticeRelation[n.storageRef.metaKey]; !ok {
m.newNodeEvent(preOrder, EventTypeRelatedUpdate)
Expand All @@ -202,10 +199,13 @@ func (n *nodeInfo) propagateNodeChange(m *manager) {
}
}

n.lock.RLock()
rangeNodeList(n.directReferredPreOrders, noticePreOrder)
rangeNodeList(n.labelReferredPreOrders, noticePreOrder)
rangeNodeList(n.directReferredPostOrders, noticePostOrder)
rangeNodeList(n.labelReferredPostOrders, noticePostOrder)
// readyToDelete will call RLock, unlock here to avoid deadlock
n.lock.RUnlock()

if n.storageRef.virtualResource {
if n.directReferredPostOrders == nil || n.directReferredPostOrders.Len() == 0 {
Expand Down Expand Up @@ -245,6 +245,7 @@ func (n *nodeInfo) preObjectDeleted() {
}

func (n *nodeInfo) resolveOwner(o Object) {
var ownerInfos []ownerInfo
for _, ownerref := range o.GetOwnerReferences() {
ownerKey := generateKey(ownerref.APIVersion, ownerref.Kind)
ownerStorage := n.storageRef.preOrderResources[ownerKey]
Expand All @@ -254,12 +255,12 @@ func (n *nodeInfo) resolveOwner(o Object) {
if _, ok := ownerStorage.ownerRelation[n.storageRef.metaKey]; !ok {
continue
}

n.ownerNodes = append(n.ownerNodes, ownerInfo{
ownerInfos = append(ownerInfos, ownerInfo{
metaKey: ownerKey,
name: ownerref.Name,
})
}
n.ownerNodes = ownerInfos
}

func metaMatchFillter(meta metav1.TypeMeta) func(info *nodeInfo) bool {
Expand Down
Loading