From 15a3012d05733db0da8016c17c7620e3c38e8a7c Mon Sep 17 00:00:00 2001 From: weisd Date: Fri, 6 Jun 2025 16:46:18 +0800 Subject: [PATCH] drop common/error --- e2e_test/src/reliant/node_interact_test.rs | 4 ++-- scripts/run.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e_test/src/reliant/node_interact_test.rs b/e2e_test/src/reliant/node_interact_test.rs index 29815be9..325f9730 100644 --- a/e2e_test/src/reliant/node_interact_test.rs +++ b/e2e_test/src/reliant/node_interact_test.rs @@ -16,8 +16,8 @@ use rustfs_filemeta::{MetaCacheEntry, MetacacheReader, MetacacheWriter}; use serde::{Deserialize, Serialize}; use std::{error::Error, io::Cursor}; use tokio::spawn; -use tonic::codegen::tokio_stream::StreamExt; use tonic::Request; +use tonic::codegen::tokio_stream::StreamExt; const CLUSTER_ADDR: &str = "http://localhost:9000"; @@ -127,7 +127,7 @@ async fn walk_dir() -> Result<(), Box> { println!("{}", resp.error_info.unwrap_or("".to_string())); } let entry = serde_json::from_str::(&resp.meta_cache_entry) - .map_err(|_e| common::error::Error::from_string(format!("Unexpected response: {:?}", response))) + .map_err(|_e| std::io::Error::other(format!("Unexpected response: {:?}", response))) .unwrap(); out.write_obj(&entry).await.unwrap(); } diff --git a/scripts/run.sh b/scripts/run.sh index d3daf4d0..fc1e6517 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -20,7 +20,7 @@ mkdir -p ./target/volume/test{0..4} if [ -z "$RUST_LOG" ]; then export RUST_BACKTRACE=1 # export RUST_LOG="rustfs=debug,ecstore=debug,s3s=debug,iam=debug" - export RUST_LOG="rustfs=info,ecstore=info,s3s=info,iam=info,rustfs-obs=info" + export RUST_LOG="rustfs=info,ecstore=info,s3s=debug" fi # export RUSTFS_ERASURE_SET_DRIVE_COUNT=5