Skip to content
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

Jump to bottom

Automated cherry pick of #4469: Bugfix: Resolve a deadlock in cluster memberlist maintanance #4472

Merged
merged 1 commit into from
Dec 13, 2022
Merged

Automated cherry pick of #4469: Bugfix: Resolve a deadlock in cluster memberlist maintanance #4472

Show file tree
Hide file tree
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
27 changes: 0 additions & 27 deletions pkg/agent/memberlist/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,23 +275,6 @@ func (c *Cluster) newClusterMember(node *corev1.Node) (string, error) {
return nodeAddr.String(), nil
}

func (c *Cluster) allClusterMembers() (clusterNodes []string, err error) {
nodes, err := c.nodeLister.List(labels.Everything())
if err != nil {
return nil, fmt.Errorf("listing Nodes error: %v", err)
}

for _, node := range nodes {
member, err := c.newClusterMember(node)
if err != nil {
klog.ErrorS(err, "Get Node failed")
continue
}
clusterNodes = append(clusterNodes, member)
}
return
}

func (c *Cluster) filterEIPsFromNodeLabels(node *corev1.Node) sets.String {
pools := sets.NewString()
eips, err := c.externalIPPoolLister.List(labels.Everything())
Expand Down Expand Up @@ -325,16 +308,6 @@ func (c *Cluster) Run(stopCh <-chan struct{}) {
return
}

members, err := c.allClusterMembers()
if err != nil {
klog.ErrorS(err, "List cluster members failed")
} else if members != nil {
_, err := c.mList.Join(members)
if err != nil {
klog.ErrorS(err, "Join cluster failed")
}
}

for i := 0; i < defaultWorkers; i++ {
go wait.Until(c.worker, time.Second, stopCh)
}
Expand Down
3 changes: 0 additions & 3 deletions pkg/agent/memberlist/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,6 @@ func TestCluster_Run(t *testing.T) {
res, err := fakeCluster.cluster.ShouldSelectIP(tCase.egress.Spec.EgressIP, eip.Name)
return err == nil && res == tCase.expectEgressSelectResult, nil
}), "select Node result for Egress does not match")
allMembers, err := fakeCluster.cluster.allClusterMembers()
assert.NoError(t, err)
assert.Len(t, allMembers, 1, "expected Node member num is 1")
assert.Equal(t, 1, fakeCluster.cluster.mList.NumMembers(), "expected alive Node num is 1")
})
}
Expand Down