openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Avoid race when pod is deleted before finalizer is added 

It may be possible that add_finalizer function first fails due
to a Conflict updating the object as it got updated (in this case
triggered the deletion) from the Kubernetes side, and then when
trying to get the new object this is actually gone as the deletion
was completed in between both actions. If that is the case we just
need to return false as there is no need to add a finalizer for it

Change-Id: I118a7c01d98722af30435f4d091820c81e4e95e4
This commit is contained in:
Luis Tomas Bolivar 2020-09-25 17:15:42 +02:00
parent cb3720cad5
commit 87090288b5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kuryr_kubernetes/k8s_client.py
View File

@ -271,7 +271,11 @@ class K8sClient(object):
# Object is being deleting or gone. Return. # Object is being deleting or gone. Return.
return False return False
except exc.K8sConflict: except exc.K8sConflict:
obj = self.get(path) try:
obj = self.get(path)
except exc.K8sResourceNotFound:
# Object got removed before finalizer was set
return False
if finalizer in obj['metadata'].get('finalizers', []): if finalizer in obj['metadata'].get('finalizers', []):
# Finalizer is there, return. # Finalizer is there, return.
return True return True