mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-19 19:16:17 +00:00
fix: resolve test conflicts and improve data scanner functionality
- Fix multi-threaded test conflicts in AHM heal integration tests - Remove global environment sharing to prevent test state pollution - Fix test_all_disk_method by clearing global disk map before test - Improve data scanner and cache value implementations - Update dependencies and resolve clippy warnings Signed-off-by: junxiang Mu <1948535941@qq.com>
This commit is contained in:
@@ -12,5 +12,14 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
use std::sync::Arc;
|
||||
|
||||
use lazy_static::lazy_static;
|
||||
use tokio_util::sync::CancellationToken;
|
||||
|
||||
// pub mod cache;
|
||||
pub mod metacache_set;
|
||||
|
||||
lazy_static! {
|
||||
pub static ref LIST_PATH_RAW_CANCEL_TOKEN: Arc<CancellationToken> = Arc::new(CancellationToken::new());
|
||||
}
|
||||
|
||||
@@ -1251,7 +1251,7 @@ impl FolderScanner {
|
||||
resolver.bucket = bucket.clone();
|
||||
let found_objs = Arc::new(RwLock::new(false));
|
||||
let found_objs_clone = found_objs.clone();
|
||||
let (tx, rx) = broadcast::channel(1);
|
||||
let (tx, _rx) = broadcast::channel(1);
|
||||
// let tx_partial = tx.clone();
|
||||
let tx_finished = tx.clone();
|
||||
let update_current_path_agreed = self.update_current_path.clone();
|
||||
@@ -1372,7 +1372,7 @@ impl FolderScanner {
|
||||
})),
|
||||
..Default::default()
|
||||
};
|
||||
let _ = list_path_raw(rx, lopts).await;
|
||||
let _ = list_path_raw(lopts).await;
|
||||
|
||||
if *found_objs.read().await {
|
||||
let this: CachedFolder = CachedFolder {
|
||||
|
||||
@@ -3685,14 +3685,6 @@ mod tests {
|
||||
assert!(format!("{service2:?}").contains("NodeService"));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_all_disk_method() {
|
||||
let service = create_test_node_service();
|
||||
let disks = service.all_disk().await;
|
||||
// Should return empty vector in test environment
|
||||
assert!(disks.is_empty());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_find_disk_method() {
|
||||
let service = create_test_node_service();
|
||||
|
||||
Reference in New Issue
Block a user