YACHT-997: Changed exception handling from Error to DeadlineExceededE…

…rror

src/backup/datastore/Table.py

@@ -1,6 +1,7 @@
 import logging
 
 from datetime import timedelta, date
+from google.appengine.api.urlfetch_errors import DeadlineExceededError
 from google.appengine.ext import ndb
 
 from src.backup.datastore.Backup import Backup
@@ -16,7 +17,7 @@ class Table(ndb.Model):
     partition_id = ndb.StringProperty(indexed=True)
 
     @classmethod
-    @retry(Exception, tries=5, delay=1, backoff=2)
+    @retry(DeadlineExceededError, tries=5, delay=1, backoff=2)
     def create(cls, project_id, dataset_id, table_id,
                partition_id, last_checked):
 
@@ -32,7 +33,7 @@ def create(cls, project_id, dataset_id, table_id,
         )
         table_entity.put()
 
-    @retry(Exception, tries=5, delay=1, backoff=2)
+    @retry(DeadlineExceededError, tries=5, delay=1, backoff=2)
     def update_last_check(self, last_checked):
         table_reference = TableReference(self.project_id, self.dataset_id,
                                          self.table_id, self.partition_id)

src/commons/big_query/big_query.py

@@ -4,15 +4,16 @@
 import googleapiclient.discovery
 import httplib2
 from apiclient.errors import HttpError, Error
+from google.appengine.api.urlfetch_errors import DeadlineExceededError
 from oauth2client.client import GoogleCredentials
 
+from src.commons.big_query.big_query_table import BigQueryTable
+from src.commons.config.configuration import configuration
 from src.commons.decorators.cached import cached
 from src.commons.decorators.google_http_error_retry import \
     google_http_error_retry
 from src.commons.decorators.log_time import log_time, measure_time_and_log
 from src.commons.decorators.retry import retry
-from src.commons.big_query.big_query_table import BigQueryTable
-from src.commons.config.configuration import configuration
 from src.commons.table_reference import TableReference
 
 
@@ -124,7 +125,7 @@ def execute_query(self, query, use_legacy_sql=True):
         return results
 
     @log_time
-    @retry(Error, tries=5, delay=1, backoff=2)
+    @retry(DeadlineExceededError, tries=5, delay=1, backoff=2)
     def list_table_partitions(self, project_id, dataset_id, table_id):
         results = self.execute_query(
             self.create_partition_query(project_id, dataset_id, table_id))