Merge "Enforce reverse time-order for sample return"

This commit is contained in:
Jenkins
2013-06-19 11:17:59 +00:00
committed by Gerrit Code Review
3 changed files with 53 additions and 24 deletions

View File

@@ -23,6 +23,7 @@ import operator
import os
import uuid
from sqlalchemy import func
from sqlalchemy import desc
from ceilometer.openstack.common import log
from ceilometer.openstack.common import timeutils
@@ -343,7 +344,7 @@ class Connection(base.Connection):
require_meter=False)
if limit:
query = query.limit(limit)
samples = query.all()
samples = query.from_self().order_by(desc(Meter.timestamp)).all()
for s in samples:
# Remove the id generated by the database when