api: rename refresh_timeout option to operation_timeout

This timeout is going to be used as a more general timeout for operations that the API needs to do and that block for a long time.
gnocchixyz · Nov 13, 2017 · e8221ef · e8221ef
1 parent c591b84
commit e8221ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/gnocchi/opts.py b/gnocchi/opts.py
@@ -173,10 +173,11 @@ def list_opts():
                        required=True,
                        help=('The maximum number of items returned in a '
                              'single response from a collection resource')),
-            cfg.IntOpt('refresh_timeout',
+            cfg.IntOpt('operation_timeout',
+                       deprecated_name="refresh_timeout",
                        default=10, min=0,
                        help='Number of seconds before timeout when attempting '
-                            'to force refresh of metric.'),
+                            'to do some operations.'),
         ) + API_OPTS,
         ),
         ("storage", _STORAGE_OPTS),

diff --git a/gnocchi/rest/api.py b/gnocchi/rest/api.py
@@ -491,7 +491,7 @@ def get_measures(self, start=None, stop=None, aggregation='mean',
             try:
                 pecan.request.storage.refresh_metric(
                     pecan.request.indexer, pecan.request.incoming, self.metric,
-                    pecan.request.conf.api.refresh_timeout)
+                    pecan.request.conf.api.operation_timeout)
             except storage.SackLockTimeoutError as e:
                 abort(503, six.text_type(e))
         try:
@@ -1790,7 +1790,7 @@ def get_cross_metric_measures_from_objs(metrics, start=None, stop=None,
                     try:
                         pecan.request.storage.refresh_metric(
                             pecan.request.indexer, pecan.request.incoming, m,
-                            pecan.request.conf.api.refresh_timeout)
+                            pecan.request.conf.api.operation_timeout)
                     except storage.SackLockTimeoutError as e:
                         abort(503, six.text_type(e))
             if number_of_metrics == 1: