GRIF-177: Increasing timeout during call export api

Author: hung-nguyen-hoang

VERSION

@@ -1 +1 @@
-3.7.80
+3.7.81

lib/gooddata/models/project.rb

@@ -1437,7 +1437,8 @@ def objects_export(objs, options = {})
       export_uri = "/gdc/md/#{pid}/maintenance/partialmdexport"
       GoodData.gd_logger.info("Project export action=objects_export, project_id=#{pid}, uri=#{export_uri}, export_status=start, export_objs=#{export_payload}") if GoodData.gd_logger
 
-      result = client.post(export_uri, export_payload)
+      # Export api will take time to finish So increasing timeout during calling the api
+      result = client.post(export_uri, export_payload, :timeout => 10)
       polling_url = result['partialMDArtifact']['status']['uri']
       token = result['partialMDArtifact']['token']
       GoodData.gd_logger.info("Project export action=objects_export, project_id=#{pid}, uri=#{polling_url}, export_status=polling") if GoodData.gd_logger

lib/gooddata/rest/connection.rb

@@ -110,30 +110,31 @@ def retryable(options = {}, &_block)
             raise e unless options[:refresh_token]
             raise e if options[:dont_reauth]
 
+            logging_retry_error(e, retry_time)
             options[:refresh_token].call # (dont_reauth: true)
             if (retries -= 1) > 0
               retry
             else
-              process_retry_error(e, retry_time)
+              fail e
             end
           rescue RestClient::TooManyRequests, RestClient::ServiceUnavailable, *retry_exception => e
+            logging_retry_error(e, retry_time)
             sleep retry_time
             # Total 10 retry requests with 1.5 coefficent should take ~ 2 mins to finish
             if (retries -= 1) > 0
               retry_time *= RETRY_TIME_COEFFICIENT
               retry
             else
-              process_retry_error(e, retry_time)
+              fail e
             end
           end
           yield
         end
 
-        def process_retry_error(e, retry_time)
+        def logging_retry_error(e, retry_time)
           error_message =  "#{e.message}, retrying in #{retry_time} seconds"
           GoodData.logger.warn error_message
           GoodData.gd_logger.warn error_message
-          fail e
         end
       end