5733

Committed 11 Sep 2021 12:40AM UTC coverage: 57.972%. First build

Build # 5733

Build Type

Pull #887

travis-ci-com

Committed by

web-flow

Commit Message

<a href="https://github.com/noironetworks/aci-containers/commit/<a class=hub.com/noironetworks/aci-containers/commit/f5a34208bd86197d92973499affec276a2727999">f5a34208b<a href="https://github.com/noironetworks/aci-containers/commit/f5a34208bd86197d92973499affec276a2727999">">Merge </a><a class="double-link" href="https://github.com/noironetworks/aci-containers/commit/<a class="double-link" href="https://github.com/noironetworks/aci-containers/commit/03f9a0e05d1739d70cc440471807ef1516019663">03f9a0e05</a>">03f9a0e05</a><a href="https://github.com/noironetworks/aci-containers/commit/f5a34208bd86197d92973499affec276a2727999"> into 130d19770">130d19770</a>

Pull Request Pull Request #887: Introduce new Snat Policy Cache RW lock to eliminate data race

Run Details

33 of 33 new or added lines in 3 files covered. (100.0%)

11420 of 19699 relevant lines covered (57.97%)

0.65 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

7.61

/pkg/hostagent/snatlocalinfo.go

// Copyright 2019 Cisco Systems, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//     http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRATIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// creates snat crs.

package hostagent

import (
        "context"
        snatLocalInfov1 "github.com/noironetworks/aci-containers/pkg/snatlocalinfo/apis/aci.snat/v1"
        v1 "k8s.io/api/core/v1"
        apierrors "k8s.io/apimachinery/pkg/api/errors"
        metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
        "reflect"
)

type SnatLocalInfo struct {
        snatIp         string
        destIps        []string
        snatpolicyName string
}

func (agent *HostAgent) UpdateLocalInfoCr() bool {
        env := agent.env.(*K8sEnvironment)
        snatLocalInfoClient := env.snatLocalInfoClient
        if snatLocalInfoClient == nil {
                agent.log.Debug("snatLocalInfo or Kube clients are not intialized")
                return false
        }
        agent.indexMutex.Lock()
        ginfos, ok := agent.opflexSnatGlobalInfos[agent.config.NodeName]
        if !ok {
                agent.indexMutex.Unlock()
                return agent.deleteLocalInfoCr()
        }

        snatLocalInfo := make(map[string]SnatLocalInfo)
        for _, ginfo := range ginfos {
                var localInfo SnatLocalInfo
                localInfo.snatIp = ginfo.SnatIp
                agent.snatPolicyCacheMutex.RLock()
                defer agent.snatPolicyCacheMutex.RUnlock()
                if _, ok := agent.snatPolicyCache[ginfo.SnatPolicyName]; ok {
                        if len(agent.snatPolicyCache[ginfo.SnatPolicyName].Spec.DestIp) == 0 {
                                localInfo.destIps = []string{"0.0.0.0/0"}
                        } else {
                                localInfo.destIps =
                                        agent.snatPolicyCache[ginfo.SnatPolicyName].Spec.DestIp
                        }
                }
                localInfo.snatpolicyName = ginfo.SnatPolicyName
                snatLocalInfo[ginfo.SnatIpUid] = localInfo
        }
        var localInfos []snatLocalInfov1.LocalInfo
        for uid, v := range agent.opflexSnatLocalInfos {
                var localinfo snatLocalInfov1.LocalInfo
                var policies []snatLocalInfov1.SnatPolicy
                for _, plcyUid := range v.PlcyUuids {
                        if linfo, ok := snatLocalInfo[plcyUid]; ok {
                                var policy snatLocalInfov1.SnatPolicy
                                policy.SnatIp = linfo.snatIp
                                policy.DestIp = linfo.destIps
                                policy.Name = linfo.snatpolicyName
                                policies = append(policies, policy)
                        }
                }
                epkey := agent.podUidToName[uid]
                podobj, exists, err := agent.podInformer.GetStore().GetByKey(epkey)
                if exists && err == nil {
                        pod := podobj.(*v1.Pod)
                        localinfo.PodName = pod.ObjectMeta.Name
                        localinfo.PodNamespace = pod.ObjectMeta.Namespace
                        agent.log.Debug("PodName:", localinfo.PodName)
                }
                localinfo.PodUid = uid
                localinfo.SnatPolicies = policies
                if len(policies) > 0 {
                        localInfos = append(localInfos, localinfo)
                }
        }
        agent.indexMutex.Unlock()
        snatLocalInfoCr, err := snatLocalInfoClient.AciV1().SnatLocalInfos(agent.config.AciSnatNamespace).Get(context.TODO(), agent.config.NodeName, metav1.GetOptions{})
        if err != nil {
                if apierrors.IsNotFound(err) {
                        snatLocalInfoInstance := &snatLocalInfov1.SnatLocalInfo{
                                ObjectMeta: metav1.ObjectMeta{
                                        Name:      agent.config.NodeName,
                                        Namespace: agent.config.AciSnatNamespace,
                                },
                                Spec: snatLocalInfov1.SnatLocalInfoSpec{
                                        LocalInfos: localInfos,
                                },
                        }
                        _, err = snatLocalInfoClient.AciV1().SnatLocalInfos(agent.config.AciSnatNamespace).Create(context.TODO(), snatLocalInfoInstance, metav1.CreateOptions{})
                }
        } else {
                Spec := snatLocalInfov1.SnatLocalInfoSpec{
                        LocalInfos: localInfos,
                }
                if !reflect.DeepEqual(snatLocalInfoCr.Spec, Spec) {
                        snatLocalInfoCr.Spec = Spec
                        _, err = snatLocalInfoClient.AciV1().SnatLocalInfos(agent.config.AciSnatNamespace).Update(context.TODO(), snatLocalInfoCr, metav1.UpdateOptions{})
                }
        }
        if err == nil {
                agent.log.Debug("SnatLocalInfo  Update Successful..")
                return false
        }
        return true
}

func (agent *HostAgent) deleteLocalInfoCr() bool {
        env := agent.env.(*K8sEnvironment)
        snatLocalInfoClient := env.snatLocalInfoClient
        _, err := snatLocalInfoClient.AciV1().SnatLocalInfos(agent.config.AciSnatNamespace).Get(context.TODO(), agent.config.NodeName, metav1.GetOptions{})
        if err == nil {
                err = snatLocalInfoClient.AciV1().SnatLocalInfos(agent.config.AciSnatNamespace).Delete(context.TODO(), agent.config.NodeName, metav1.DeleteOptions{})
                if err != nil {
                        agent.log.Debug("SnatLocalInfo failed to delete: ", err)
                        return true
                }
        }
        return false
}

1	// Copyright 2019 Cisco Systems, Inc.
2	//
3	// Licensed under the Apache License, Version 2.0 (the "License");
4	// you may not use this file except in compliance with the License.
5	// You may obtain a copy of the License at
6	//
7	// http://www.apache.org/licenses/LICENSE-2.0
8	//
9	// Unless required by applicable law or agreed to in writing, software
10	// distributed under the License is distributed on an "AS IS" BASIS,
11	// WITHOUT WARRATIES OR CONDITIONS OF ANY KIND, either express or implied.
12	// See the License for the specific language governing permissions and
13	// limitations under the License.
14
15	// creates snat crs.
16
17	package hostagent
18
19	import (
20	"context"
21	snatLocalInfov1 "github.com/noironetworks/aci-containers/pkg/snatlocalinfo/apis/aci.snat/v1"
22	v1 "k8s.io/api/core/v1"
23	apierrors "k8s.io/apimachinery/pkg/api/errors"
24	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
25	"reflect"
26	)
27
28	type SnatLocalInfo struct {
29	snatIp string
30	destIps []string
31	snatpolicyName string
32	}
33
34	func (agent *HostAgent) UpdateLocalInfoCr() bool {	1✔
35	env := agent.env.(*K8sEnvironment)	1✔
36	snatLocalInfoClient := env.snatLocalInfoClient	1✔
37	if snatLocalInfoClient == nil {	2✔
38	agent.log.Debug("snatLocalInfo or Kube clients are not intialized")	1✔
39	return false	1✔
40	}	1✔
41	agent.indexMutex.Lock()	×
42	ginfos, ok := agent.opflexSnatGlobalInfos[agent.config.NodeName]	×
43	if !ok {	×
44	agent.indexMutex.Unlock()	×
45	return agent.deleteLocalInfoCr()	×
46	}	×
47
48	snatLocalInfo := make(map[string]SnatLocalInfo)	×
49	for _, ginfo := range ginfos {	×
50	var localInfo SnatLocalInfo	×
51	localInfo.snatIp = ginfo.SnatIp	×
52	agent.snatPolicyCacheMutex.RLock()	×
53	defer agent.snatPolicyCacheMutex.RUnlock()	×
54	if _, ok := agent.snatPolicyCache[ginfo.SnatPolicyName]; ok {	×
55	if len(agent.snatPolicyCache[ginfo.SnatPolicyName].Spec.DestIp) == 0 {	×
56	localInfo.destIps = []string{"0.0.0.0/0"}	×
57	} else {	×
58	localInfo.destIps =	×
59	agent.snatPolicyCache[ginfo.SnatPolicyName].Spec.DestIp	×
60	}	×
61	}
62	localInfo.snatpolicyName = ginfo.SnatPolicyName	×
63	snatLocalInfo[ginfo.SnatIpUid] = localInfo	×
64	}
65	var localInfos []snatLocalInfov1.LocalInfo	×
66	for uid, v := range agent.opflexSnatLocalInfos {	×
67	var localinfo snatLocalInfov1.LocalInfo	×
68	var policies []snatLocalInfov1.SnatPolicy	×
69	for _, plcyUid := range v.PlcyUuids {	×
70	if linfo, ok := snatLocalInfo[plcyUid]; ok {	×
71	var policy snatLocalInfov1.SnatPolicy	×
72	policy.SnatIp = linfo.snatIp	×
73	policy.DestIp = linfo.destIps	×
74	policy.Name = linfo.snatpolicyName	×
75	policies = append(policies, policy)	×
76	}	×
77	}
78	epkey := agent.podUidToName[uid]	×
79	podobj, exists, err := agent.podInformer.GetStore().GetByKey(epkey)	×
80	if exists && err == nil {	×
81	pod := podobj.(*v1.Pod)	×
82	localinfo.PodName = pod.ObjectMeta.Name	×
83	localinfo.PodNamespace = pod.ObjectMeta.Namespace	×
84	agent.log.Debug("PodName:", localinfo.PodName)	×
85	}	×
86	localinfo.PodUid = uid	×
87	localinfo.SnatPolicies = policies	×
88	if len(policies) > 0 {	×
89	localInfos = append(localInfos, localinfo)	×
90	}	×
91	}
92	agent.indexMutex.Unlock()	×
93	snatLocalInfoCr, err := snatLocalInfoClient.AciV1().SnatLocalInfos(agent.config.AciSnatNamespace).Get(context.TODO(), agent.config.NodeName, metav1.GetOptions{})	×
94	if err != nil {	×
95	if apierrors.IsNotFound(err) {	×
96	snatLocalInfoInstance := &snatLocalInfov1.SnatLocalInfo{	×
97	ObjectMeta: metav1.ObjectMeta{	×
98	Name: agent.config.NodeName,	×
99	Namespace: agent.config.AciSnatNamespace,	×
100	},	×
101	Spec: snatLocalInfov1.SnatLocalInfoSpec{	×
102	LocalInfos: localInfos,	×
103	},	×
104	}	×
105	_, err = snatLocalInfoClient.AciV1().SnatLocalInfos(agent.config.AciSnatNamespace).Create(context.TODO(), snatLocalInfoInstance, metav1.CreateOptions{})	×
106	}	×
107	} else {	×
108	Spec := snatLocalInfov1.SnatLocalInfoSpec{	×
109	LocalInfos: localInfos,	×
110	}	×
111	if !reflect.DeepEqual(snatLocalInfoCr.Spec, Spec) {	×
112	snatLocalInfoCr.Spec = Spec	×
113	_, err = snatLocalInfoClient.AciV1().SnatLocalInfos(agent.config.AciSnatNamespace).Update(context.TODO(), snatLocalInfoCr, metav1.UpdateOptions{})	×
114	}	×
115	}
116	if err == nil {	×
117	agent.log.Debug("SnatLocalInfo Update Successful..")	×
118	return false	×
119	}	×
120	return true	×
121	}
122
123	func (agent *HostAgent) deleteLocalInfoCr() bool {	×
124	env := agent.env.(*K8sEnvironment)	×
125	snatLocalInfoClient := env.snatLocalInfoClient	×
126	_, err := snatLocalInfoClient.AciV1().SnatLocalInfos(agent.config.AciSnatNamespace).Get(context.TODO(), agent.config.NodeName, metav1.GetOptions{})	×
127	if err == nil {	×
128	err = snatLocalInfoClient.AciV1().SnatLocalInfos(agent.config.AciSnatNamespace).Delete(context.TODO(), agent.config.NodeName, metav1.DeleteOptions{})	×
129	if err != nil {	×
130	agent.log.Debug("SnatLocalInfo failed to delete: ", err)	×
131	return true	×
132	}	×
133	}
134	return false	×
135	}

noironetworks / aci-containers / 5733

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous