openstack/aodh
Code Issues Proposed changes

Merge "Tolerate absent recorded_at on older mongo/db2 samples"

Browse Source
This commit is contained in:
Jenkins 2014-02-25 20:44:15 +00:00 committed by Gerrit Code Review
commit 5149ed7a6f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/storage/impl_db2.py
View File

@ -354,6 +354,8 @@ class Connection(pymongo_base.Connection):
del s['_id']
# Backward compatibility for samples without units
s['counter_unit'] = s.get('counter_unit', '')
# Tolerate absence of recorded_at in older datapoints
s['recorded_at'] = s.get('recorded_at')
yield models.Sample(**s)
def get_meter_statistics(self, sample_filter, period=None, groupby=None):

2
ceilometer/storage/impl_mongodb.py
View File

@ -611,6 +611,8 @@ class Connection(pymongo_base.Connection):
del s['_id']
# Backward compatibility for samples without units
s['counter_unit'] = s.get('counter_unit', '')
# Tolerate absence of recorded_at in older datapoints
s['recorded_at'] = s.get('recorded_at')
yield models.Sample(**s)
def get_samples(self, sample_filter, limit=None):