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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add sync map to fix cocurrent write #2918

Merged
merged 2 commits into from
Jun 9, 2023
Merged

add sync map to fix cocurrent write #2918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67e9f20
add sync map to fix cocurrent write
changluyi Jun 8, 2023
d4ced81
change type
changluyi Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ type Controller struct {
podsSynced cache.InformerSynced
addOrUpdatePodQueue workqueue.RateLimitingInterface
deletePodQueue workqueue.RateLimitingInterface
deletingPodObjMap map[string]*corev1.Pod
deletingPodObjMap *sync.Map
updatePodSecurityQueue workqueue.RateLimitingInterface
podKeyMutex keymutex.KeyMutex

Expand Down Expand Up @@ -298,12 +298,13 @@ func Run(ctx context.Context, config *Configuration) {
numKeyLocks = config.WorkerNum * 2
}
controller := &Controller{
config: config,
vpcs: &sync.Map{},
podSubnetMap: &sync.Map{},
ovnLegacyClient: ovs.NewLegacyClient(config.OvnNbAddr, config.OvnTimeout, config.OvnSbAddr, config.ClusterRouter, config.ClusterTcpLoadBalancer, config.ClusterUdpLoadBalancer, config.ClusterTcpSessionLoadBalancer, config.ClusterUdpSessionLoadBalancer, config.NodeSwitch, config.NodeSwitchCIDR),
ipam: ovnipam.NewIPAM(),
namedPort: NewNamedPort(),
config: config,
vpcs: &sync.Map{},
podSubnetMap: &sync.Map{},
deletingPodObjMap: &sync.Map{},
ovnLegacyClient: ovs.NewLegacyClient(config.OvnNbAddr, config.OvnTimeout, config.OvnSbAddr, config.ClusterRouter, config.ClusterTcpLoadBalancer, config.ClusterUdpLoadBalancer, config.ClusterTcpSessionLoadBalancer, config.ClusterUdpSessionLoadBalancer, config.NodeSwitch, config.NodeSwitchCIDR),
ipam: ovnipam.NewIPAM(),
namedPort: NewNamedPort(),

vpcsLister: vpcInformer.Lister(),
vpcSynced: vpcInformer.Informer().HasSynced,
Expand Down Expand Up @@ -395,7 +396,6 @@ func Run(ctx context.Context, config *Configuration) {
workqueue.NewNamedDelayingQueue("DeletePod"),
workqueue.DefaultControllerRateLimiter(),
),
deletingPodObjMap: make(map[string]*corev1.Pod),
updatePodSecurityQueue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "UpdatePodSecurity"),
podKeyMutex: keymutex.NewHashed(numKeyLocks),

Expand Down
31 changes: 17 additions & 14 deletions pkg/controller/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,17 +199,17 @@ func (c *Controller) enqueueAddPod(obj interface{}) {
if isStateful || (isVmPod && c.config.EnableKeepVmIP) {
if isStateful && isStatefulSetPodToDel(c.config.KubeClient, p, statefulSetName) {
klog.V(3).Infof("enqueue delete pod %s", key)
c.deletingPodObjMap[key] = p
c.deletingPodObjMap.Store(key, p)
c.deletePodQueue.Add(key)
}
if isVmPod && c.isVmPodToDel(p, vmName) {
klog.V(3).Infof("enqueue delete pod %s", key)
c.deletingPodObjMap[key] = p
c.deletingPodObjMap.Store(key, p)
c.deletePodQueue.Add(key)
}
} else {
klog.V(3).Infof("enqueue delete pod %s", key)
c.deletingPodObjMap[key] = p
c.deletingPodObjMap.Store(key, p)
c.deletePodQueue.Add(key)
}
return
Expand Down Expand Up @@ -240,7 +240,7 @@ func (c *Controller) enqueueDeletePod(obj interface{}) {
}

klog.V(3).Infof("enqueue delete pod %s", key)
c.deletingPodObjMap[key] = p
c.deletingPodObjMap.Store(key, p)
c.deletePodQueue.Add(key)
}

Expand Down Expand Up @@ -294,7 +294,7 @@ func (c *Controller) enqueueUpdatePod(oldObj, newObj interface{}) {
isVmPod, vmName := isVmPod(newPod)
if !isPodStatusPhaseAlive(newPod) && !isStateful && !isVmPod {
klog.V(3).Infof("enqueue delete pod %s", key)
c.deletingPodObjMap[key] = newPod
c.deletingPodObjMap.Store(key, newPod)
c.deletePodQueue.Add(key)
return
}
Expand All @@ -314,7 +314,7 @@ func (c *Controller) enqueueUpdatePod(oldObj, newObj interface{}) {
// In case node get lost and pod can not be deleted,
// the ip address will not be recycled
klog.V(3).Infof("enqueue delete pod %s after %v", key, delay)
c.deletingPodObjMap[key] = newPod
c.deletingPodObjMap.Store(key, newPod)
c.deletePodQueue.AddAfter(key, delay)
}()
return
Expand All @@ -324,15 +324,15 @@ func (c *Controller) enqueueUpdatePod(oldObj, newObj interface{}) {
if isStateful && isStatefulSetPodToDel(c.config.KubeClient, newPod, statefulSetName) {
go func() {
klog.V(3).Infof("enqueue delete pod %s after %v", key, delay)
c.deletingPodObjMap[key] = newPod
c.deletingPodObjMap.Store(key, newPod)
c.deletePodQueue.AddAfter(key, delay)
}()
return
}
if isVmPod && c.isVmPodToDel(newPod, vmName) {
go func() {
klog.V(3).Infof("enqueue delete pod %s after %v", key, delay)
c.deletingPodObjMap[key] = newPod
c.deletingPodObjMap.Store(key, newPod)
c.deletePodQueue.AddAfter(key, delay)
}()
return
Expand Down Expand Up @@ -420,8 +420,7 @@ func (c *Controller) processNextDeletePodWorkItem() bool {
utilruntime.HandleError(fmt.Errorf("expected string in workqueue but got %#v", obj))
return nil
}
_, exist := c.deletingPodObjMap[key]
if !exist {
if _, ok := c.deletingPodObjMap.Load(key); !ok {
return nil
}

Expand All @@ -435,7 +434,7 @@ func (c *Controller) processNextDeletePodWorkItem() bool {
// gc pod obj in c.deletingPodObjMap
go func() {
time.Sleep(5 * time.Minute)
delete(c.deletingPodObjMap, key)
c.deletingPodObjMap.Delete(key)
}()
return nil
}(obj)
Expand Down Expand Up @@ -718,7 +717,7 @@ func (c *Controller) reconcileAllocateSubnets(cachedPod, pod *v1.Pod, needAlloca
// Sometimes pod is deleted between kube-ovn configure ovn-nb and patch pod.
// Then we need to recycle the resource again.
key := strings.Join([]string{namespace, name}, "/")
c.deletingPodObjMap[key] = pod
c.deletingPodObjMap.Store(key, pod)
c.deletePodQueue.AddRateLimited(key)
return nil, nil
}
Expand Down Expand Up @@ -865,7 +864,7 @@ func (c *Controller) reconcileRouteSubnets(cachedPod, pod *v1.Pod, needRoutePodN
// Sometimes pod is deleted between kube-ovn configure ovn-nb and patch pod.
// Then we need to recycle the resource again.
key := strings.Join([]string{namespace, name}, "/")
c.deletingPodObjMap[key] = pod
c.deletingPodObjMap.Store(key, pod)
c.deletePodQueue.AddRateLimited(key)
return nil
}
Expand All @@ -876,7 +875,11 @@ func (c *Controller) reconcileRouteSubnets(cachedPod, pod *v1.Pod, needRoutePodN
}

func (c *Controller) handleDeletePod(key string) error {
pod := c.deletingPodObjMap[key]
podObj, ok := c.deletingPodObjMap.Load(key)
if !ok {
return nil
}
pod := podObj.(*v1.Pod)
podName := c.getNameByPod(pod)
c.podKeyMutex.LockKey(key)
defer func() { _ = c.podKeyMutex.UnlockKey(key) }()
Expand Down