diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-01-19 00:29:05 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-01-19 00:29:05 -0500 |
commit | f98ae787b7235f42f1b869ea616f386f9cc41f7c (patch) | |
tree | 0138da93b5bf11a19af598da28267b3e0f709fba /meta-openstack/recipes-devtools/python/python-ceilometer | |
parent | af0608bb4490ee4a7147d152432eda001ee9ef1f (diff) | |
download | meta-cloud-services-f98ae787b7235f42f1b869ea616f386f9cc41f7c.tar.gz |
ceilometer: fix postgresql query errors
From the patch:
sqlalchemy: fix ceilometer resource query
Implement the abandoned ceilometer fix from:
https://review.openstack.org/#/c/59204/ [Fix for get_statistics with postgresql]
Without this fix, the ceilometer resource tab in horizon returns an error due
to badly formed SQL and a database backend error.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-ceilometer')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-ceilometer/sqlalchemy-fix-ceilometer-resource-query.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/sqlalchemy-fix-ceilometer-resource-query.patch b/meta-openstack/recipes-devtools/python/python-ceilometer/sqlalchemy-fix-ceilometer-resource-query.patch new file mode 100644 index 0000000..fae92d6 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-ceilometer/sqlalchemy-fix-ceilometer-resource-query.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 249139daafd4ac4cdc60a70d033ee7026d3354e7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
3 | Date: Sun, 19 Jan 2014 00:25:48 -0500 | ||
4 | Subject: [PATCH] sqlalchemy: fix ceilometer resource query | ||
5 | |||
6 | Implement the abandoned ceilometer fix from: | ||
7 | |||
8 | https://review.openstack.org/#/c/59204/ [Fix for get_statistics with postgresql] | ||
9 | |||
10 | Without this fix, the ceilometer resource tab in horizon returns an error due | ||
11 | to badly formed SQL and a database backend error. | ||
12 | |||
13 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
14 | --- | ||
15 | ceilometer/storage/impl_sqlalchemy.py | 4 +++- | ||
16 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py | ||
19 | index 8d321eaaeffe..f1c99a72ded9 100644 | ||
20 | --- a/ceilometer/storage/impl_sqlalchemy.py | ||
21 | +++ b/ceilometer/storage/impl_sqlalchemy.py | ||
22 | @@ -577,7 +577,9 @@ class Connection(base.Connection): | ||
23 | group_attributes = [getattr(Meter, g) for g in groupby] | ||
24 | select.extend(group_attributes) | ||
25 | |||
26 | - query = session.query(*select) | ||
27 | + #Group by counter_unit for postgresql queries | ||
28 | + #In mysql this doesn't change anything because one meter has one unit | ||
29 | + query = session.query(*select).group_by(Meter.counter_unit) | ||
30 | |||
31 | if groupby: | ||
32 | query = query.group_by(*group_attributes) | ||
33 | -- | ||
34 | 1.7.10.4 | ||
35 | |||