storage: remove double check of granularity

The storage engine check twice that the granularity matches. Do it once only.
gnocchixyz · Dec 14, 2017 · 572f015 · 572f015
1 parent 30d865e
commit 572f015
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/gnocchi/storage/__init__.py b/gnocchi/storage/__init__.py
@@ -241,18 +241,14 @@ def _get_measures_timeserie(self, metric,
         else:
             raise GranularityDoesNotExist(metric, granularity)
 
-        all_keys = None
         try:
             all_keys = self._list_split_keys_for_metric(
                 metric, aggregation, granularity)
         except MetricDoesNotExist:
-            for d in metric.archive_policy.definition:
-                if d.granularity == granularity:
-                    return carbonara.AggregatedTimeSerie(
-                        sampling=granularity,
-                        aggregation_method=aggregation,
-                        max_size=d.points)
-            raise GranularityDoesNotExist(metric, granularity)
+            return carbonara.AggregatedTimeSerie(
+                sampling=granularity,
+                aggregation_method=aggregation,
+                max_size=points)
 
         if from_timestamp:
             from_timestamp = carbonara.SplitKey.from_timestamp_and_sampling(