Fix infinite recursion deadlock on netns cleanup
When, for some reason, the neutron netns agent is misconfigured and is producing errors, this infinite recursion is generating a deadlock on cpu usage since it repeats with no interval. This fix adds some shorter sleeps to work around it. Signed-off-by: Thiago Brito <thiago.brito@windriver.com> Change-Id: Icf840ea965d0652d6118a1b840168df95ba95fac
This commit is contained in:
parent
b13a8de906
commit
151c03d5ec
@ -14,7 +14,7 @@ apiVersion: v1
|
|||||||
appVersion: v1.0.0
|
appVersion: v1.0.0
|
||||||
description: OpenStack-Helm Neutron
|
description: OpenStack-Helm Neutron
|
||||||
name: neutron
|
name: neutron
|
||||||
version: 0.2.11
|
version: 0.2.12
|
||||||
home: https://docs.openstack.org/neutron/latest/
|
home: https://docs.openstack.org/neutron/latest/
|
||||||
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
|
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
|
||||||
sources:
|
sources:
|
||||||
|
@ -17,8 +17,10 @@ if __name__ == "__main__":
|
|||||||
sys.stderr.write(
|
sys.stderr.write(
|
||||||
"Cleaning network namespaces caught an exception %s"
|
"Cleaning network namespaces caught an exception %s"
|
||||||
% str(ex))
|
% str(ex))
|
||||||
|
time.sleep(30)
|
||||||
except:
|
except:
|
||||||
sys.stderr.write(
|
sys.stderr.write(
|
||||||
"Cleaning network namespaces caught an exception")
|
"Cleaning network namespaces caught an exception")
|
||||||
|
time.sleep(30)
|
||||||
finally:
|
finally:
|
||||||
cfg.CONF.clear()
|
cfg.CONF.clear()
|
||||||
|
@ -25,4 +25,5 @@ neutron:
|
|||||||
- 0.2.9 Add option to disable helm.sh/hook annotations
|
- 0.2.9 Add option to disable helm.sh/hook annotations
|
||||||
- 0.2.10 Update htk requirements repo
|
- 0.2.10 Update htk requirements repo
|
||||||
- 0.2.11 Improve health probe logging
|
- 0.2.11 Improve health probe logging
|
||||||
|
- 0.2.12 Fix infinite recursion deadlock on netns cleanup cron
|
||||||
...
|
...
|
||||||
|
Loading…
x
Reference in New Issue
Block a user