diff options
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-ceilometerclient/fix_ceilometerclient_memory_leak.patch | 37 | ||||
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb | 23 |
2 files changed, 9 insertions, 51 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometerclient/fix_ceilometerclient_memory_leak.patch b/meta-openstack/recipes-devtools/python/python-ceilometerclient/fix_ceilometerclient_memory_leak.patch deleted file mode 100644 index 8abc6541..00000000 --- a/meta-openstack/recipes-devtools/python/python-ceilometerclient/fix_ceilometerclient_memory_leak.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- - ceilometerclient/openstack/common/apiclient/client.py | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/ceilometerclient/openstack/common/apiclient/client.py -+++ b/ceilometerclient/openstack/common/apiclient/client.py -@@ -90,6 +90,7 @@ - self.user_agent = user_agent or self.user_agent - - self.times = [] # [("item", starttime, endtime), ...] -+ self.times_max_len = 200 - self.timings = timings - - # requests within the same session can reuse TCP connections from pool -@@ -142,6 +143,12 @@ - def reset_timings(self): - self.times = [] - -+ def get_timings_max_len(self): -+ return self.times_max_len -+ -+ def set_timings_max_len(self, new_len): -+ self.times_max_len = new_len -+ - def request(self, method, url, **kwargs): - """Send an http request with the specified characteristics. - -@@ -173,6 +180,9 @@ - if self.timings: - self.times.append(("%s %s" % (method, url), - start_time, time.time())) -+ # remove oldest items until we maintain max length -+ while len(self.times) > self.times_max_len: -+ del self.times[0] - self._http_log_resp(resp) - - if resp.status_code >= 400: diff --git a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb index a830e510..0341cacb 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb @@ -9,30 +9,25 @@ DEPENDS += " \ python-pbr \ " -RDEPENDS_${PN} +=" \ - python-cliff \ - python-httplib2 \ - python-iso8601 \ - python-prettytable \ - python-pyparsing \ - python-simplejson \ - python-pbr \ +RDEPENDS_${PN} += " \ + python-pbr \ + python-iso8601 \ + python-keystoneauth1 \ python-oslo.i18n \ python-oslo.serialization \ python-oslo.utils \ - python-keystoneclient \ + python-prettytable \ python-requests \ python-six \ python-stevedore \ - " + " SRC_URI = "\ - git://github.com/openstack/python-ceilometerclient.git;branch=master \ - file://fix_ceilometerclient_memory_leak.patch \ + git://github.com/openstack/python-ceilometerclient.git;branch=stable/pike \ " -PV = "1.5.0+git${SRCPV}" -SRCREV = "daed7e59c383f1ca74d75160cbc99fbd89675648" +PV = "2.9.0+git${SRCPV}" +SRCREV = "4ee321feeef39fa2a297ad8e58e931b8a03d8f14" S = "${WORKDIR}/git" inherit setuptools rmargparse |