openstack/aodh
Code Issues Proposed changes

Fixes dict metadata query issue of HBase

Browse Source 
Now HBase doesn't support query the metadata with the dictionary
type. For example, the metadata of Glance image always has the
metadata "properties" which is dictionary and has some attributes,
size, kernel id, etc. So this fix will enable the HBase driver of
CM to support query like "metadata.properties.tag=test".

Fixes bug 1206022

Change-Id: I7fa73cea94a948d47e27492dfb7e3a0e005ccb48
This commit is contained in:
Fei Long Wang 2013-07-31 23:13:37 +08:00
parent 0975ae3415
commit bf9857e30e
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ceilometer/storage/impl_hbase.py
View File

@ -449,8 +449,18 @@ class Connection(base.Connection):
for k, v in metaquery.iteritems():
message = json.loads(meter['f:message'])
metadata = message['resource_metadata']
if metadata[k.split('.', 1)[1]] != v:
break # if one metaquery doesn't match, break
keys = k.split('.')
# Support the dictionary type of metadata
for key in keys[1:]:
if key in metadata:
metadata = metadata[key]
else:
break
# NOTE (flwang) For multiple level searching, the matadata
# object will be drilled down to check if it's matched
# with the searched value.
if metadata != v:
break
else:
if limit:
limit -= 1

23
tests/api/v2/test_list_meters_scenarios.py
View File

@ -108,7 +108,12 @@ class TestListMeters(FunctionalTest,
'resource-id4',
timestamp=datetime.datetime(2012, 7, 2, 10, 43),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter4'},
'tag': 'self.counter4',
'properties': {
'prop_1': 'prop_value',
'prop_2': {'sub_prop_1':
'sub_prop_value'}}
},
source='test_source')]:
msg = rpc.meter_message_from_counter(
cnt,
@ -127,6 +132,22 @@ class TestListMeters(FunctionalTest,
set(['meter.test',
'meter.mine']))
def test_list_meters_with_dict_metadata(self):
data = self.get_json('/meters/meter.mine',
q=[{'field':
'metadata.properties.prop_2.sub_prop_1',
'op': 'eq',
'value': 'sub_prop_value',
}])
self.assertEquals(1, len(data))
self.assertEquals('resource-id4', data[0]['resource_id'])
metadata = data[0]['resource_metadata']
self.assertIsNotNone(metadata)
# FIXME (flwang): Based on current implement, the metadata of
# dictionary type can't be shown in the output. See bug 1203699.
# Will add more asserts in the fix of 1203699.
self.assertEqual('self.counter4', metadata['tag'])
def test_list_meters_metadata_query(self):
data = self.get_json('/meters/meter.test',
q=[{'field': 'metadata.tag',