Merge pull request #397 from FoamyGuy/attempt_fix_actions_hang

Attempt to fix actions hang

Author: tannewt

adabot/github_requests.py

@@ -103,8 +103,9 @@ def request(method, url, **kwargs):
             logging.warning("Rate Limit will reset at: %s", rate_limit_reset)
             reset_diff = rate_limit_reset - datetime.datetime.now()
 
-            logging.info("Sleeping %s seconds", reset_diff.seconds)
-            time.sleep(reset_diff.seconds + 1)
+            # wait a full extra 60 seconds to avoid time collision
+            logging.info("Sleeping %s seconds", reset_diff.seconds + 60)
+            time.sleep(reset_diff.seconds + 60)
 
     return response
 

adabot/lib/bundle_announcer.py

@@ -19,6 +19,8 @@
 import github as pygithub
 import parse
 
+from adabot.lib.common_funcs import MAXIMUM_RATE_LIMIT_DELAY
+
 GH_INTERFACE = pygithub.Github(os.environ.get("ADABOT_GITHUB_ACCESS_TOKEN"))
 
 RepoResult: TypeAlias = Tuple[str, str]
@@ -82,7 +84,7 @@ def get_bundle_updates(full_repo_name: str) -> Tuple[Set[RepoResult], Set[RepoRe
             core_rate_limit_reset = GH_INTERFACE.get_rate_limit().core.reset
             sleep_time = core_rate_limit_reset - datetime.datetime.utcnow()
             logging.warning("Rate Limit will reset at: %s", core_rate_limit_reset)
-            time.sleep(sleep_time.seconds)
+            time.sleep(min(sleep_time.seconds, MAXIMUM_RATE_LIMIT_DELAY))
             continue
         except pygithub.GithubException:
             # Secrets may not be available or error occurred - just skip

adabot/lib/circuitpython_library_validators.py

@@ -935,7 +935,9 @@ def validate_readthedocs(self, repo):
                 core_rate_limit_reset = GH_INTERFACE.get_rate_limit().core.reset
                 sleep_time = core_rate_limit_reset - datetime.datetime.utcnow()
                 logging.warning("Rate Limit will reset at: %s", core_rate_limit_reset)
-                time.sleep(sleep_time.seconds)
+                time.sleep(
+                    min(sleep_time.seconds, common_funcs.MAXIMUM_RATE_LIMIT_DELAY)
+                )
                 continue
             except pygithub.GithubException:
                 errors.append(ERROR_RTD_FAILED_TO_LOAD_BUILD_STATUS_GH_NONLIMITED)
@@ -1295,7 +1297,9 @@ def validate_actions_state(self, repo):
                 core_rate_limit_reset = GH_INTERFACE.get_rate_limit().core.reset
                 sleep_time = core_rate_limit_reset - datetime.datetime.utcnow()
                 logging.warning("Rate Limit will reset at: %s", core_rate_limit_reset)
-                time.sleep(sleep_time.seconds)
+                time.sleep(
+                    min(sleep_time.seconds, common_funcs.MAXIMUM_RATE_LIMIT_DELAY)
+                )
 
     def validate_default_branch(self, repo):
         """Makes sure that the default branch is main"""

adabot/lib/common_funcs.py

@@ -17,6 +17,8 @@
 
 CORE_REPO_URL = "/repos/adafruit/circuitpython"
 
+MAXIMUM_RATE_LIMIT_DELAY = 62 * 60  # 62 minutes
+
 
 def parse_gitmodules(input_text):
     # pylint: disable=anomalous-backslash-in-string