mirror of
https://github.com/rustfs/rustfs.git
synced 2026-11-20 23:15:23 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 635746534b | |||
| 6a94097b97 |
@@ -5082,7 +5082,14 @@ mod tests {
|
||||
let cert = generate_simple_self_signed(vec!["localhost".to_string()]).expect("certificate should generate");
|
||||
let (port, server) = spawn_https_server(&cert, 2);
|
||||
let endpoint = format!("https://localhost:{port}");
|
||||
let strict = target_client_for_test("arn:strict", endpoint.clone(), s3_client_for_test(port, None));
|
||||
let strict_client = s3_client_for_test(port, None);
|
||||
// A failed trust check must consume just one of the two fixture connections.
|
||||
let strict_config = strict_client
|
||||
.config()
|
||||
.to_builder()
|
||||
.retry_config(aws_sdk_s3::config::retry::RetryConfig::disabled())
|
||||
.build();
|
||||
let strict = target_client_for_test("arn:strict", endpoint.clone(), S3Client::from_conf(strict_config));
|
||||
let insecure = target_client_for_test(
|
||||
"arn:insecure",
|
||||
endpoint,
|
||||
|
||||
@@ -175,6 +175,7 @@ fn lock_write_rejects_bucket_replacement(write: LockWrite) {
|
||||
bucket::{BucketOperations, DeleteBucketOptions, MakeBucketOptions},
|
||||
object::{ObjectIO, ObjectOperations},
|
||||
};
|
||||
use crate::storage::storage_api::ecstore_object::WriteCompletion;
|
||||
use crate::storage::storage_api::{StorageObjectOptions, StoragePutObjReader};
|
||||
use rustfs_scanner::{SegmentInvalidationProducerIdentity, set_scanner_dirty_usage_mutation_observer};
|
||||
use std::sync::{Arc, Mutex};
|
||||
@@ -205,6 +206,8 @@ fn lock_write_rejects_bucket_replacement(write: LockWrite) {
|
||||
&mut StoragePutObjReader::from_vec(body.to_vec()),
|
||||
&StorageObjectOptions {
|
||||
versioned: true,
|
||||
// The test snapshots every disk immediately after this write.
|
||||
write_completion: WriteCompletion::TailDrained,
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
|
||||
@@ -333,7 +333,7 @@ root = Path(sys.argv[1])
|
||||
records = [(path, json.loads(path.read_text())) for path in (root / "requests").glob("*.timing.json")]
|
||||
assert len(records) == 5, records
|
||||
assert len({row["clock_id"] for _, row in records}) == 1
|
||||
assert len({row["start_ns"] for _, row in records}) == 5
|
||||
# Concurrent requests can start in the same monotonic clock tick.
|
||||
for _, row in records:
|
||||
assert 0 < row["start_ns"] < row["end_ns"]
|
||||
assert row["start_unix_ns"] > 0 and row["end_unix_ns"] > 0
|
||||
|
||||
Reference in New Issue
Block a user