gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-26 05:56:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix ctrl +c

Browse Source 
Signed-off-by: mujunxiang <1948535941@qq.com>
This commit is contained in:
mujunxiang
2024-11-26 11:21:29 +08:00
parent a5d8d1990c
commit bb5d41147a
2 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ecstore/Cargo.toml
+1 -1
View File
@@ -47,7 +47,7 @@ sha2 = { version = "0.11.0-pre.4" }
hex-simd = "0.8.0" hex-simd = "0.8.0"
path-clean = "1.0.1" path-clean = "1.0.1"
tempfile.workspace = true tempfile.workspace = true
tokio = { workspace = true, features = ["io-util", "sync"] } tokio = { workspace = true, features = ["io-util", "sync", "signal"] }
tokio-stream = "0.1.15" tokio-stream = "0.1.15"
tonic.workspace = true tonic.workspace = true
tower.workspace = true tower.workspace = true
ecstore/src/store.rs
+35 -18
View File
@@ -41,7 +41,6 @@ use crate::{
}, },
store_init, utils, store_init, utils,
}; };
use backon::{ExponentialBuilder, Retryable};
use common::globals::{GLOBAL_Local_Node_Name, GLOBAL_Rustfs_Host, GLOBAL_Rustfs_Port}; use common::globals::{GLOBAL_Local_Node_Name, GLOBAL_Rustfs_Host, GLOBAL_Rustfs_Port};
use futures::future::join_all; use futures::future::join_all;
use glob::Pattern; use glob::Pattern;
@@ -51,6 +50,7 @@ use rand::Rng;
use s3s::dto::{BucketVersioningStatus, ObjectLockConfiguration, ObjectLockEnabled, VersioningConfiguration}; use s3s::dto::{BucketVersioningStatus, ObjectLockConfiguration, ObjectLockEnabled, VersioningConfiguration};
use s3s::{S3Error, S3ErrorCode}; use s3s::{S3Error, S3ErrorCode};
use std::cmp::Ordering; use std::cmp::Ordering;
use std::process::exit;
use std::slice::Iter; use std::slice::Iter;
use std::time::SystemTime; use std::time::SystemTime;
use std::{ use std::{
@@ -61,7 +61,7 @@ use std::{
use time::OffsetDateTime; use time::OffsetDateTime;
use tokio::sync::mpsc::Sender; use tokio::sync::mpsc::Sender;
use tokio::sync::{broadcast, mpsc, RwLock}; use tokio::sync::{broadcast, mpsc, RwLock};
use tokio::time::interval; use tokio::time::{interval, sleep};
use tokio::{fs, select}; use tokio::{fs, select};
use tracing::{debug, info}; use tracing::{debug, info};
use uuid::Uuid; use uuid::Uuid;
@@ -126,22 +126,39 @@ impl ECStore {
DiskError::check_disk_fatal_errs(&errs)?; DiskError::check_disk_fatal_errs(&errs)?;
let fm = (|| async { let fm = {
store_init::connect_load_init_formats( let mut times = 0;
first_is_local, let mut interval = 1;
&disks, loop {
pool_eps.set_count, if let Ok(fm) = store_init::connect_load_init_formats(
pool_eps.drives_per_set, first_is_local,
deployment_id, &disks,
) pool_eps.set_count,
.await pool_eps.drives_per_set,
}) deployment_id,
.retry(ExponentialBuilder::default().with_max_times(usize::MAX)) )
.sleep(tokio::time::sleep) .await
.notify(|err, dur: Duration| { {
info!("retrying get formats {:?} after {:?}", err, dur); break fm;
}) }
.await?; times += 1;
if interval < 16 {
interval *= 2;
}
if times > 10 {
return Err(Error::from_string("can not get formats"));
}
info!("retrying get formats after {:?}", interval);
tokio::select! {
_ = tokio::signal::ctrl_c() => {
info!("got ctrl+c, exits");
exit(0);
}
_ = sleep(Duration::from_secs(interval)) => {
}
}
}
};
if deployment_id.is_none() { if deployment_id.is_none() {
deployment_id = Some(fm.id); deployment_id = Some(fm.id);