Merge pull request #1490 from rafaelweingartner/fix_execessive_warning_logs

Clean excessive warnings logs

Author: tobias-urdin

gnocchi/indexer/sqlalchemy.py

@@ -814,7 +814,7 @@ def list_metrics(self, details=False, status='active',
                 if policy_filter or resource_policy_filter:
                     q = q.filter(sqlalchemy.or_(policy_f, resource_policy_f))
 
-            sort_keys, sort_dirs = self._build_sort_keys(sorts, ['id'])
+            sort_keys, sort_dirs = self._build_sort_keys(sorts, ['id', 'name', 'resource_id'])
 
             if marker:
                 metric_marker = self.list_metrics(
@@ -1234,15 +1234,23 @@ def _get_history_result_mapper(self, session, resource_type,
         union_stmt = sqlalchemy.union(s1, s2)
         stmt = union_stmt.alias("result")
 
+        stmt.info = {'oslodb_unique_keys': [set(['id', 'revision'])]}
+
         class Result(base.ResourceJsonifier, base.GnocchiBase):
             def __iter__(self):
                 return iter((key, getattr(self, key)) for key in stmt.c.keys())
 
+        # We are always registering a new mapper for the same Class.
+        # Therefore, a lot of warnings are generated in SQLalchemy.
+        # To avoid such issues, and also a memory leak, we can clean
+        # the previously registered ones.
+        mapper_reg.dispose()
         mapper_reg.map_imperatively(
             Result, stmt, primary_key=[stmt.c.id, stmt.c.revision],
             properties={
                 'metrics': sqlalchemy.orm.relationship(
                     Metric,
+                    overlaps="metrics,resource",
                     primaryjoin=sqlalchemy.and_(
                         Metric.resource_id == stmt.c.id,
                         Metric.status == 'active'),

gnocchi/rest/aggregates/api.py

@@ -211,7 +211,8 @@ def add_measure(self, measure, date_map, start, stop):
         self.measures.append(measure)
 
     def join_sequential_groups(self, group):
-        group.sort(key=lambda key: key['search_start'])
+        group.sort(key=lambda key: utils.to_timestamp(key['search_start']) if key['search_start'] else None)
+
         new_group = []
         last_it = None
         for it in group:
@@ -360,17 +361,17 @@ def truncate_resource_time_window(self, value, is_first=False):
             value['search_start'] = self.start
         elif self.start:
             if value['search_start']:
-                search_start = numpy.datetime64(value['search_start'])
-                value['search_start'] = max(search_start, self.start)
+                search_start = utils.to_timestamp(value['search_start'])
+                value['search_start'] = max(search_start, utils.to_timestamp(self.start))
             else:
-                value['search_start'] = self.start
+                value['search_start'] = utils.to_timestamp(self.start)
 
         if self.end:
             if value['search_end']:
-                search_end = numpy.datetime64(value['search_end'])
-                value['search_end'] = min(search_end, self.end)
+                search_end = utils.to_timestamp(value['search_end'])
+                value['search_end'] = min(search_end, utils.to_timestamp(self.end))
             else:
-                value['search_end'] = self.end
+                value['search_end'] = utils.to_timestamp(self.end)
 
         LOG.debug("Timewindow of object [%s] after truncating.", value)