Skip to content

Commit

Permalink
Merge pull request #1849 from sawsa307/ep-count-zero
Browse files Browse the repository at this point in the history 
Add check for endpoint count is zero
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Nov 24, 2022
2 parents be2093b + fafe2d4 commit 528c909
Show file tree
Hide file tree
Showing 2 changed files with 246 additions and 18 deletions.
9 changes: 9 additions & 0 deletions pkg/neg/syncers/transaction.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,14 @@ func (s *transactionSyncer) ensureNetworkEndpointGroups() error {
// endpiontPodMap removes the duplicated endpoints, and dupCount stores the number of duplicated it removed
// and we compare the endpoint counts with duplicates
// 2. There is at least one endpoint in endpointData with missing nodeName
// 3. The endpoint count from endpointData or the one from endpointPodMap is 0
func (s *transactionSyncer) invalidEndpointInfo(eds []negtypes.EndpointsData, endpointPodMap negtypes.EndpointPodMap, dupCount int) bool {
// Endpoint count from EndpointPodMap
countFromPodMap := len(endpointPodMap) + dupCount
if countFromPodMap == 0 {
s.logger.Info("Detected endpoint count from endpointPodMap going to zero", "endpointPodMap", endpointPodMap)
return true
}

// Endpoint count from EndpointData
countFromEndpointData := 0
Expand All @@ -379,6 +384,10 @@ func (s *transactionSyncer) invalidEndpointInfo(eds []negtypes.EndpointsData, en
}
}
}
if countFromEndpointData == 0 {
s.logger.Info("Detected endpoint count from endpointData going to zero", "endpointData", eds)
return true
}

if countFromEndpointData != countFromPodMap {
s.logger.Info("Detected error when comparing endpoint counts", "endpointData", eds, "endpointPodMap", endpointPodMap, "dupCount", dupCount)
Expand Down
255 changes: 237 additions & 18 deletions pkg/neg/syncers/transaction_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1429,7 +1429,7 @@ func TestInvalidEndpointInfo(t *testing.T) {
testPodName3 := "pod3"
testPodName4 := "pod4"

endpointPodMap := map[negtypes.NetworkEndpoint]types.NamespacedName{
testEndpointPodMap := map[negtypes.NetworkEndpoint]types.NamespacedName{
{
IP: testIP1,
Port: "80",
Expand Down Expand Up @@ -1465,10 +1465,11 @@ func TestInvalidEndpointInfo(t *testing.T) {
}

testCases := []struct {
desc string
endpointsData []negtypes.EndpointsData
dupCount int
expect bool
desc string
endpointsData []negtypes.EndpointsData
endpointPodMap map[negtypes.NetworkEndpoint]types.NamespacedName
dupCount int
expect bool
}{
{
desc: "counts equal, endpointData has no duplicated endpoints",
Expand Down Expand Up @@ -1538,8 +1539,9 @@ func TestInvalidEndpointInfo(t *testing.T) {
},
},
},
dupCount: 0,
expect: false,
endpointPodMap: testEndpointPodMap,
dupCount: 0,
expect: false,
},
{
desc: "counts equal, endpointData has duplicated endpoints",
Expand Down Expand Up @@ -1618,8 +1620,9 @@ func TestInvalidEndpointInfo(t *testing.T) {
},
},
},
dupCount: 1,
expect: false,
endpointPodMap: testEndpointPodMap,
dupCount: 1,
expect: false,
},
{
desc: "counts not equal, endpointData has no duplicated endpoints",
Expand Down Expand Up @@ -1680,8 +1683,9 @@ func TestInvalidEndpointInfo(t *testing.T) {
},
},
},
dupCount: 0,
expect: true,
endpointPodMap: testEndpointPodMap,
dupCount: 0,
expect: true,
},
{
desc: "counts not equal, endpointData has duplicated endpoints",
Expand Down Expand Up @@ -1751,8 +1755,9 @@ func TestInvalidEndpointInfo(t *testing.T) {
},
},
},
dupCount: 1,
expect: true,
endpointPodMap: testEndpointPodMap,
dupCount: 1,
expect: true,
},
{
desc: "no missing nodeNames",
Expand Down Expand Up @@ -1822,8 +1827,9 @@ func TestInvalidEndpointInfo(t *testing.T) {
},
},
},
dupCount: 0,
expect: false,
endpointPodMap: testEndpointPodMap,
dupCount: 0,
expect: false,
},
{
desc: "at least one endpoint is missing a nodeName",
Expand Down Expand Up @@ -1893,14 +1899,227 @@ func TestInvalidEndpointInfo(t *testing.T) {
},
},
},
dupCount: 0,
expect: true,
endpointPodMap: testEndpointPodMap,
dupCount: 0,
expect: true,
},
{
desc: "endpointData has zero endpoint",
endpointsData: []negtypes.EndpointsData{
{
Meta: &metav1.ObjectMeta{
Name: testServiceName + "-1",
Namespace: testServiceNamespace,
},
Ports: []negtypes.PortData{
{
Name: testPortName,
Port: port80,
},
},
Addresses: []negtypes.AddressData{},
},
{
Meta: &metav1.ObjectMeta{
Name: testServiceName + "-2",
Namespace: testServiceNamespace,
},
Ports: []negtypes.PortData{
{
Name: testPortName,
Port: port81,
},
},
Addresses: []negtypes.AddressData{},
},
},
endpointPodMap: testEndpointPodMap,
dupCount: 0,
expect: true,
},
{
desc: "endpointPodMap has zero endpoint",
endpointsData: []negtypes.EndpointsData{
{
Meta: &metav1.ObjectMeta{
Name: testServiceName + "-1",
Namespace: testServiceNamespace,
},
Ports: []negtypes.PortData{
{
Name: testPortName,
Port: port80,
},
},
Addresses: []negtypes.AddressData{
{
TargetRef: &corev1.ObjectReference{
Namespace: testServiceNamespace,
Name: testPodName1,
},
NodeName: &instance1,
Addresses: []string{testIP1},
Ready: true,
},
{
TargetRef: &corev1.ObjectReference{
Namespace: testServiceNamespace,
Name: testPodName2,
},
NodeName: &instance1,
Addresses: []string{testIP2},
Ready: true,
},
},
},
{
Meta: &metav1.ObjectMeta{
Name: testServiceName + "-2",
Namespace: testServiceNamespace,
},
Ports: []negtypes.PortData{
{
Name: testPortName,
Port: port81,
},
},
Addresses: []negtypes.AddressData{
{
TargetRef: &corev1.ObjectReference{
Namespace: testServiceNamespace,
Name: testPodName3,
},
NodeName: &instance2,
Addresses: []string{testIP3},
Ready: true,
},
{
TargetRef: &corev1.ObjectReference{
Namespace: testServiceNamespace,
Name: testPodName4,
},
NodeName: &instance4,
Addresses: []string{testIP4},
Ready: true,
},
},
},
},
endpointPodMap: map[negtypes.NetworkEndpoint]types.NamespacedName{},
dupCount: 0,
expect: true,
},
{
desc: "endpointData and endpointPodMap both have zero endpoint",
endpointsData: []negtypes.EndpointsData{
{
Meta: &metav1.ObjectMeta{
Name: testServiceName + "-1",
Namespace: testServiceNamespace,
},
Ports: []negtypes.PortData{
{
Name: testPortName,
Port: port80,
},
},
Addresses: []negtypes.AddressData{},
},
{
Meta: &metav1.ObjectMeta{
Name: testServiceName + "-2",
Namespace: testServiceNamespace,
},
Ports: []negtypes.PortData{
{
Name: testPortName,
Port: port81,
},
},
Addresses: []negtypes.AddressData{},
},
},
endpointPodMap: map[negtypes.NetworkEndpoint]types.NamespacedName{},
dupCount: 0,
expect: true,
},
{
desc: "endpointData and endpointPodMap both have non-zero endpoints",
endpointsData: []negtypes.EndpointsData{
{
Meta: &metav1.ObjectMeta{
Name: testServiceName + "-1",
Namespace: testServiceNamespace,
},
Ports: []negtypes.PortData{
{
Name: testPortName,
Port: port80,
},
},
Addresses: []negtypes.AddressData{
{
TargetRef: &corev1.ObjectReference{
Namespace: testServiceNamespace,
Name: testPodName1,
},
NodeName: &instance1,
Addresses: []string{testIP1},
Ready: true,
},
{
TargetRef: &corev1.ObjectReference{
Namespace: testServiceNamespace,
Name: testPodName2,
},
NodeName: &instance1,
Addresses: []string{testIP2},
Ready: true,
},
},
},
{
Meta: &metav1.ObjectMeta{
Name: testServiceName + "-2",
Namespace: testServiceNamespace,
},
Ports: []negtypes.PortData{
{
Name: testPortName,
Port: port81,
},
},
Addresses: []negtypes.AddressData{
{
TargetRef: &corev1.ObjectReference{
Namespace: testServiceNamespace,
Name: testPodName3,
},
NodeName: &instance2,
Addresses: []string{testIP3},
Ready: true,
},
{
TargetRef: &corev1.ObjectReference{
Namespace: testServiceNamespace,
Name: testPodName4,
},
NodeName: &instance4,
Addresses: []string{testIP4},
Ready: true,
},
},
},
},
endpointPodMap: testEndpointPodMap,
dupCount: 0,
expect: false,
},
}

for _, tc := range testCases {
t.Run(tc.desc, func(t *testing.T) {
if got := transactionSyncer.invalidEndpointInfo(tc.endpointsData, endpointPodMap, tc.dupCount); got != tc.expect {
if got := transactionSyncer.invalidEndpointInfo(tc.endpointsData, tc.endpointPodMap, tc.dupCount); got != tc.expect {
t.Errorf("invalidEndpointInfo() = %t, expected %t", got, tc.expect)
}
})
Expand Down

0 comments on commit 528c909

Please sign in to comment.