Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: change timeout to have all tests passed on slow laptop

pull/24376/head
Nga Tran 2021-06-30 16:04:02 -04:00
parent 9448b8044e
commit f6731c60d7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/influxdb_ioxd/rpc/storage/service.rs
View File

@ -2762,16 +2762,16 @@ mod tests {
}
}
/// loop and try to make a client connection for 5 seconds,
/// loop and try to make a client connection for 30 seconds,
/// returning the result of the connection
async fn connect_to_server<T>(bind_addr: SocketAddr) -> Result<T, tonic::transport::Error>
where
T: NewClient,
{
const MAX_RETRIES: u32 = 10;
const MAX_RETRIES: u32 = 30;
let mut retry_count = 0;
loop {
let mut interval = tokio::time::interval(Duration::from_millis(500));
let mut interval = tokio::time::interval(Duration::from_millis(1000));
match T::connect(format!("http://{}", bind_addr)).await {
Ok(client) => {

10
tests/common/server_fixture.rs
View File

@ -356,7 +356,7 @@ impl TestServer {
let try_http_connect = async {
let client = reqwest::Client::new();
let url = format!("{}/health", self.addrs().http_base);
let mut interval = tokio::time::interval(Duration::from_millis(500));
let mut interval = tokio::time::interval(Duration::from_millis(1000));
loop {
match client.get(&url).send().await {
Ok(resp) => {
@ -373,7 +373,7 @@ impl TestServer {
let pair = future::join(try_http_connect, try_grpc_connect);
let capped_check = tokio::time::timeout(Duration::from_secs(3), pair);
let capped_check = tokio::time::timeout(Duration::from_secs(30), pair);
match capped_check.await {
Ok(_) => {
@ -412,7 +412,7 @@ impl TestServer {
// if server ID was set, we can also wait until DBs are loaded
let check_dbs_loaded = async {
let mut interval = tokio::time::interval(Duration::from_millis(500));
let mut interval = tokio::time::interval(Duration::from_millis(1000));
while !management_client
.get_server_status()
@ -424,7 +424,7 @@ impl TestServer {
}
};
let capped_check = tokio::time::timeout(Duration::from_secs(3), check_dbs_loaded);
let capped_check = tokio::time::timeout(Duration::from_secs(30), check_dbs_loaded);
match capped_check.await {
Ok(_) => {
@ -464,7 +464,7 @@ pub async fn grpc_channel(
}
pub async fn wait_for_grpc(addrs: &BindAddresses) {
let mut interval = tokio::time::interval(Duration::from_millis(500));
let mut interval = tokio::time::interval(Duration::from_millis(1000));
loop {
match grpc_channel(addrs).await {