Merge pull request #2668 from chaoss/fix-insert-data-issue

Fix retry insert data issue
chaoss · Jan 23, 2024 · ce50ea3 · ce50ea3
2 parents 1c94076 + 51c58e6
commit ce50ea3
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/augur/application/db/session.py b/augur/application/db/session.py
@@ -194,14 +194,15 @@ def insert_data(self, data: Union[List[dict], dict], table, natural_keys: List[s
 
                 except Exception as e:
                     #self.logger.info(e)
-                    if(len(data) == 1):
+                    if len(data) == 1:
                         raise e
-                    else:
-                        first_half = data[:len(data)//2]
-                        second_half = data[len(data)//2:]
+
+                    time.sleep(3)
+                    first_half = data[:len(data)//2]
+                    second_half = data[len(data)//2:]
 
-                        self.insert_data(first_half, table,natural_keys, return_columns, string_fields, on_conflict_update)
-                        self.insert_data(second_half,table, natural_keys, return_columns, string_fields, on_conflict_update)
+                    self.insert_data(first_half, table, natural_keys, return_columns, string_fields, on_conflict_update)
+                    self.insert_data(second_half,table, natural_keys, return_columns, string_fields, on_conflict_update)
 
             else:
                 self.logger.error("Unable to insert data in 10 attempts")
@@ -231,14 +232,15 @@ def insert_data(self, data: Union[List[dict], dict], table, natural_keys: List[s
                 raise e
 
             except Exception as e:
-                if(len(data) == 1):
+                if len(data) == 1:
                     raise e
-                else:
-                    first_half = data[:len(data)//2]
-                    second_half = data[len(data)//2:]
+
+                time.sleep(3)
+                first_half = data[:len(data)//2]
+                second_half = data[len(data)//2:]
 
-                    self.insert_data(first_half, natural_keys, return_columns, string_fields, on_conflict_update)
-                    self.insert_data(second_half, natural_keys, return_columns, string_fields, on_conflict_update)
+                self.insert_data(first_half, table, natural_keys, return_columns, string_fields, on_conflict_update)
+                self.insert_data(second_half, table, natural_keys, return_columns, string_fields, on_conflict_update)
 
         else:
             self.logger.error("Unable to insert and return data in 10 attempts")