howler-api 3.0.0.dev361__py3-none-any.whl → 3.0.0.dev365__py3-none-any.whl

howler/datastore/collection.py

@@ -418,8 +418,11 @@ class ESCollection(Generic[ModelType]):
         #   - update_by_query
         #   - delete_by_query
         #   - reindex ...
+        attempt = 0
         res = None
         while res is None:
+            attempt = attempt + 1
+            logger.warning("Checking status of task %s (Attempt %s)", task["task"], attempt)
             try:
                 res = self.with_retries(
                     self.datastore.client.tasks.get,
@@ -435,9 +438,14 @@ class ESCollection(Generic[ModelType]):
                 ]:
                     pass
                 else:
+                    logger.exception("Unexpected error on task check")
                     raise
 
-        return res.get("response", res["task"]["status"])
+        result = res.get("response", res["task"]["status"])
+
+        logger.info("Task result:\n%s", str(result))
+
+        return result
 
     def _get_current_alias(self, index: str) -> typing.Optional[str]:
         if self.with_retries(self.datastore.client.indices.exists_alias, name=index):
@@ -679,6 +687,7 @@ class ESCollection(Generic[ModelType]):
 
         :return: Should return True of the commit was successful on all hosts
         """
+        logger.warning("Beginning Reindex")
         for index in self.index_list:
             new_name = f"{index}__reindex"
             index_data = None
@@ -689,6 +698,7 @@ class ESCollection(Generic[ModelType]):
                 index_data = self.with_retries(self.datastore.client.indices.get, index=index)[index]
 
                 # Create reindex target
+                logger.warning("Creating new index with name %s", new_name)
                 self.with_retries(
                     self.datastore.client.indices.create,
                     index=new_name,
@@ -719,36 +729,39 @@ class ESCollection(Generic[ModelType]):
                     else:
                         alias_actions = [{"add": {"index": new_name, "alias": alias}}]
 
+                    logger.warning("Updating alias %s", alias)
                     self.with_retries(self.datastore.client.indices.update_aliases, actions=alias_actions)
 
                 # Reindex data into target
+                logger.warning("Beginning reindex from %s to %s", index, new_name)
                 r_task = self.with_retries(
                     self.datastore.client.reindex,
                     source={"index": index},
                     dest={"index": new_name},
                     wait_for_completion=False,
                 )
+                logger.warning("Reindex taskId: %s", r_task["task"])
                 self._get_task_results(r_task)
 
             if self.with_retries(self.datastore.client.indices.exists, index=new_name):
                 if index_data is None:
                     index_data = self.with_retries(self.datastore.client.indices.get, index=index)[index]
 
-                # Commit reindexed data
+                logger.warning("Committing reindexed data in index %s", new_name)
                 self.with_retries(self.datastore.client.indices.refresh, index=new_name)
                 self.with_retries(self.datastore.client.indices.clear_cache, index=new_name)
 
-                # Delete old index
+                logger.warning("Deleting old index %s", index)
                 if self.with_retries(self.datastore.client.indices.exists, index=index):
                     self.with_retries(self.datastore.client.indices.delete, index=index)
 
-                # Block write to the index
+                logger.warning("Block write to index")
                 self.with_retries(
                     self.datastore.client.indices.put_settings,
                     settings=write_block_settings,
                 )
 
-                # Rename reindexed index
+                logger.warning("Renaming reindexed index from %s to %s", new_name, index)
                 try:
                     self._safe_index_copy(
                         self.datastore.client.indices.clone,
@@ -776,11 +789,11 @@ class ESCollection(Generic[ModelType]):
                                 actions=alias_actions,
                             )
 
-                    # Delete the reindex target if it still exists
                     if self.with_retries(self.datastore.client.indices.exists, index=new_name):
+                        logger.warning("Deleting reindex target %s", new_name)
                         self.with_retries(self.datastore.client.indices.delete, index=new_name)
                 finally:
-                    # Unblock write to the index
+                    logger.warning("Unblock write to the index")
                     self.with_retries(
                         self.datastore.client.indices.put_settings,
                         settings=write_unblock_settings,

{howler_api-3.0.0.dev361.dist-info → howler_api-3.0.0.dev365.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: howler-api
-Version: 3.0.0.dev361
+Version: 3.0.0.dev365
 Summary: Howler - API server
 License: MIT
 Keywords: howler,alerting,gc,canada,cse-cst,cse,cst,cyber,cccs

{howler_api-3.0.0.dev361.dist-info → howler_api-3.0.0.dev365.dist-info}/RECORD

@@ -53,7 +53,7 @@ howler/cronjobs/view_cleanup.py,sha256=ULWLR1uFcRemRgkEDrMqmBamHiE0dgDvu49VK0qDk
 howler/datastore/README.md,sha256=ekWl1YJSrHlZpU5PgBkPEzPWjdbTdav6Rd2P0ccIesw,4758
 howler/datastore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 howler/datastore/bulk.py,sha256=VfolZfiaBD4ZTK3j6IVVVq4GMjVXb5elrsGwwM_nONE,2829
-howler/datastore/collection.py,sha256=YNDZ_x3q3Upq1PRD_2akOxcBp52FK52VrtzTf4wGWEQ,90363
+howler/datastore/collection.py,sha256=69VhtrFp24Alssm-yTuDHqPZ1XWhN5Ty-eeRJaPQEP4,91154
 howler/datastore/constants.py,sha256=x7ODomtOQmDjmXoAxly4onPAnUkq4BLZ1TBg-UgpU1g,2415
 howler/datastore/exceptions.py,sha256=yZvQXRI4mR50ltGFHbdZAD4TIbhdKJku6LLTPQ0JZRk,955
 howler/datastore/howler_store.py,sha256=kW7FKM-tILcfTmrjSB1yZm-ZnumPS_tiQEZUDaQoDkg,2915
@@ -192,7 +192,7 @@ howler/utils/path.py,sha256=DfOU4i4zSs4wchHoE8iE7aWVLkTxiC_JRGepF2hBYBk,690
 howler/utils/socket_utils.py,sha256=nz1SklC9xBHUSfHyTJjpq3mbozX1GDf01WzdGxfaUII,2212
 howler/utils/str_utils.py,sha256=HE8Hqh2HlOLaj16w0H9zKOyDJLp-f1LQ50y_WeGZaEk,8389
 howler/utils/uid.py,sha256=p9dsqyvZ-lpiAuzZWCPCeEM99kdk0Ly9czf04HNdSuw,1341
-howler_api-3.0.0.dev361.dist-info/METADATA,sha256=zsVoOU9_C2GMioaWIilcLuXlA2frF05eKdbJ_B-WZxY,2804
-howler_api-3.0.0.dev361.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-howler_api-3.0.0.dev361.dist-info/entry_points.txt,sha256=Lu9SBGvwe0wczJHmc-RudC24lmQk7tv3ZBXon9RIihg,259
-howler_api-3.0.0.dev361.dist-info/RECORD,,
+howler_api-3.0.0.dev365.dist-info/METADATA,sha256=XsJAA4VR6oNnUAdD7R6sPLoog-6Eub-fooNZah4Iwx0,2804
+howler_api-3.0.0.dev365.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+howler_api-3.0.0.dev365.dist-info/entry_points.txt,sha256=Lu9SBGvwe0wczJHmc-RudC24lmQk7tv3ZBXon9RIihg,259
+howler_api-3.0.0.dev365.dist-info/RECORD,,