Fix flush timeout (#602)

Author: yhaliaw

docs/changelog.md

@@ -2,6 +2,10 @@
 
 This changelog documents user-relevant changes to the GitHub runner charm.
 
+## 2025-07-28
+
+- Fix an issue where the charm can error out due to timeout during flush runners.
+
 ## 2025-07-24
 
 - Fix an issue with infinite retry of a reactive job message.

src/manager_client.py

@@ -24,6 +24,11 @@
 NO_RESPONSE_ERROR_MESSAGE = "Failed request with no response"
 CONNECTION_ERROR_MESSAGE = "Failed request due to connection failure"
 NOT_READY_ERROR_MESSAGE = "GitHub runner manager service not ready"
+# For request that modifies the runner, GitHub runner manager service might need to wait for
+# reconcile to finish before processing the request, hence the long timeout for write-level
+# requests.
+WRITE_TIMEOUT = 60 * 20
+READ_TIMEOUT = 60 * 5
 
 
 def catch_requests_errors(func: Callable) -> Callable:
@@ -124,7 +129,7 @@ def check_runner(self) -> dict[str, str]:
             The information on the runners.
         """
         self.wait_till_ready()
-        response = self._request(_HTTPMethod.GET, "/runner/check", timeout=600)
+        response = self._request(_HTTPMethod.GET, "/runner/check", timeout=READ_TIMEOUT)
         runner_info = json.loads(response.text)
         runner_info["runners"] = tuple(runner_info["runners"])
         runner_info["busy_runners"] = tuple(runner_info["busy_runners"])
@@ -140,7 +145,7 @@ def flush_runner(self, busy: bool = False) -> None:
         """
         self.wait_till_ready()
         params = {"flush-busy": str(busy)}
-        self._request(_HTTPMethod.POST, "/runner/flush", params=params, timeout=600)
+        self._request(_HTTPMethod.POST, "/runner/flush", params=params, timeout=WRITE_TIMEOUT)
 
     def health_check(self) -> None:
         """Request a health check on the runner manager service.
@@ -153,7 +158,7 @@ def health_check(self) -> None:
                 API requests.
         """
         try:
-            response = self._request(_HTTPMethod.GET, "/health", timeout=60)
+            response = self._request(_HTTPMethod.GET, "/health", timeout=READ_TIMEOUT)
         except requests.HTTPError as err:
             raise RunnerManagerServiceNotReadyError(NOT_READY_ERROR_MESSAGE) from err
         except requests.ConnectionError as err: