Merge 5c1e202 into 42e0849

4dn-dcic · Jan 15, 2020 · 339d72a · 339d72a
2 parents 42e0849 + 5c1e202
commit 339d72a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/chalicelib/check_setup.json b/chalicelib/check_setup.json
@@ -110,7 +110,7 @@
         "title": "Change in item counts",
         "group": "Metadata checks",
         "schedule": {
-            "morning_checks": {
+            "morning_checks_2": {
                 "all": {
                     "kwargs": {"primary": true},
                     "dependencies": []
@@ -756,7 +756,7 @@
         "title": "Process Download Tracking Items",
         "group": "System checks",
         "schedule": {
-            "hourly_checks": {
+            "ten_min_checks": {
                 "data": {
                     "kwargs": {"primary": true},
                     "dependencies": ["purge_download_tracking_items"]
@@ -910,7 +910,7 @@
         "title": "Purge Download Tracking Items",
         "group": "Cleanup checks",
         "schedule": {
-            "hourly_checks": {
+            "ten_min_checks": {
                 "data": {
                     "kwargs": {"primary": true},
                     "dependencies": []

diff --git a/chalicelib/checks/system_checks.py b/chalicelib/checks/system_checks.py
@@ -727,12 +727,14 @@ def purge_download_tracking_items(connection, **kwargs):
 
     # Don't run if staging deployment is running
     # Only need to check if our env is data
-    if connection.fs_env == 'data':
-        staging_conn = init_connection('staging')
-        staging_deploy = CheckResult(staging_conn, 'staging_deployment').get_primary_result()
-        if staging_deploy['status'] != 'PASS':
-            check.summary = 'Staging deployment is running - skipping'
-            return check
+    # XXX: Removing for now as we find the check can never run without this
+    # if the staging deploy takes long enough or errors
+    # if connection.fs_env == 'data':
+    #     staging_conn = init_connection('staging')
+    #     staging_deploy = CheckResult(staging_conn, 'staging_deployment').get_primary_result()
+    #     if staging_deploy['status'] != 'PASS':
+    #         check.summary = 'Staging deployment is running - skipping'
+    #         return check
 
     if get_stage_info()['stage'] != 'prod':
         check.summary = check.description = 'This check only runs on Foursight prod'