Auto merge of #596 - Mark-Simulacrum:retry-timeout, r=Mark-Simulacrum

Retry timeout

rust-lang/rust#92413 (comment) failed due to a request timeout, plausibly because of a parallel request (e.g., metrics) which locked out the database for long enough to cause a failure. This changes our retry logic to hopefully always retry timed out requests.

(It does not take the step we took with docker builds of unilaterally retrying *all* requests, but that may be a better path rather than trying to guess... for now this seems a more limited answer).

Author: bors

src/agent/api.rs

@@ -11,7 +11,6 @@ use reqwest::header::AUTHORIZATION;
 use reqwest::{Method, StatusCode};
 use serde::de::DeserializeOwned;
 use serde_json::json;
-use std::error::Error as _;
 
 #[derive(Debug, Fail)]
 pub enum AgentApiError {
@@ -93,17 +92,7 @@ impl AgentApi {
                     let retry = if let Some(AgentApiError::ServerUnavailable) = err.downcast_ref() {
                         true
                     } else if let Some(err) = err.downcast_ref::<::reqwest::Error>() {
-                        let reqwest_io = err
-                            .source()
-                            .map(|inner| inner.is::<::std::io::Error>())
-                            .unwrap_or(false);
-                        let hyper_io = err
-                            .source()
-                            .and_then(|inner| inner.downcast_ref::<::hyper::Error>())
-                            .and_then(|inner| inner.source())
-                            .map(|inner| inner.is::<::std::io::Error>())
-                            .unwrap_or(false);
-                        reqwest_io || hyper_io
+                        err.is_timeout() || err.is_connect()
                     } else {
                         false
                     };