From 02f129b1bb1fc17f17b2fbca43bd997aa8b28d09 Mon Sep 17 00:00:00 2001 From: Amy Fong Date: Fri, 28 Mar 2014 15:58:45 -0400 Subject: Memory leak from timings Memory leak happens when the dynamic list times grows without anything to reset it. In ceilometer and cinder configuration files, the new option is created: [nova_client] max_timing_buffer= In all clients found that uses extends the HTTPClient and uses the times list, we limit the size of the list by popping off the oldest item in the list to maintain a maximum size. A default size of 200 is chosen, configurable by the above configuration option. Signed-off-by: Amy Fong Signed-off-by: Bruce Ashfield --- .../python/python-ceilometer/ceilometer.conf | 3 ++- .../fix_ceilometer_memory_leak.patch | 27 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta-openstack/recipes-devtools/python/python-ceilometer/fix_ceilometer_memory_leak.patch (limited to 'meta-openstack/recipes-devtools/python/python-ceilometer') diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf index 4632f40..6340a15 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf +++ b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf @@ -868,4 +868,5 @@ admin_tenant_name=%SERVICE_TENANT_NAME% # Password for Redis server. (optional) (string value) #password= - +# [nova_client] +# max_timing_buffer=100 diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/fix_ceilometer_memory_leak.patch b/meta-openstack/recipes-devtools/python/python-ceilometer/fix_ceilometer_memory_leak.patch new file mode 100644 index 0000000..bdc1bf7 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-ceilometer/fix_ceilometer_memory_leak.patch @@ -0,0 +1,27 @@ +--- + ceilometer/nova_client.py | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/ceilometer/nova_client.py ++++ b/ceilometer/nova_client.py +@@ -26,6 +26,12 @@ + + LOG = log.getLogger(__name__) + ++nova_client_opts = [ ++ cfg.IntOpt('max_timing_buffer', ++ default=200, ++ help='The max number of the timing objects to keep'), ++] ++cfg.CONF.register_opts(nova_client_opts, group="nova_client") + + def logged(func): + +@@ -56,6 +62,7 @@ + endpoint_type=conf.os_endpoint_type, + cacert=conf.os_cacert, + no_cache=True) ++ self.nova_client.set_timings_max_len(cfg.CONF.nova_client.max_timing_buffer) + + def _with_flavor_and_image(self, instances): + for instance in instances: -- cgit v1.2.3-54-g00ecf