mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-21 11:56:38 +00:00
chore(deps): refresh mimalloc revision (#5736)
* chore(deps): refresh mimalloc revision Update mimalloc and libmimalloc-sys to the requested git revision after running the dependency refresh flow. Keep ratelimit excluded while accepting compatible dependency updates from cargo update and cargo upgrade. Harden all-feature test compilation by giving heavy integration test crates their own recursion limit and avoiding a cross-thread spawn for the embedded startup barrier future. Co-Authored-By: heihutu <heihutu@gmail.com> * upgrade version --------- Co-authored-by: heihutu <heihutu@gmail.com>
This commit is contained in:
@@ -12,6 +12,8 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#![recursion_limit = "256"]
|
||||
|
||||
use aws_sdk_s3::config::{Credentials, Region};
|
||||
use aws_sdk_s3::{Client, Config};
|
||||
use reqwest::StatusCode;
|
||||
|
||||
@@ -12,6 +12,8 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#![recursion_limit = "256"]
|
||||
|
||||
//! End-to-end acceptance for backlog#1052: two embedded RustFS servers coexist
|
||||
//! in one process, on different ports and volumes, and their S3 data planes
|
||||
//! stay isolated.
|
||||
@@ -455,17 +457,30 @@ async fn second_embedded_server_fails_closed_until_its_context_slot_is_installed
|
||||
let b_access_key = "startup-window-access-b";
|
||||
let b_secret_key = "startup-window-secret-b";
|
||||
let mut barrier = pause_embedded_startup_after_http_bind(port_b);
|
||||
let startup_b = tokio::spawn(async move {
|
||||
RustFSServerBuilder::new()
|
||||
.address(format!("127.0.0.1:{port_b}"))
|
||||
.access_key(b_access_key)
|
||||
.secret_key(b_secret_key)
|
||||
.build()
|
||||
.await
|
||||
});
|
||||
tokio::time::timeout(Duration::from_secs(10), barrier.wait_until_http_bound())
|
||||
.await
|
||||
.expect("server B must bind HTTP before installing its context slot");
|
||||
let startup_b = RustFSServerBuilder::new()
|
||||
.address(format!("127.0.0.1:{port_b}"))
|
||||
.access_key(b_access_key)
|
||||
.secret_key(b_secret_key)
|
||||
.build();
|
||||
tokio::pin!(startup_b);
|
||||
{
|
||||
let bound = tokio::time::timeout(Duration::from_secs(10), barrier.wait_until_http_bound());
|
||||
tokio::pin!(bound);
|
||||
tokio::select! {
|
||||
bound = &mut bound => {
|
||||
bound.expect("server B must bind HTTP before installing its context slot");
|
||||
}
|
||||
startup = startup_b.as_mut() => {
|
||||
match startup {
|
||||
Ok(server) => {
|
||||
server.shutdown().await;
|
||||
panic!("server B startup completed before the HTTP-bind barrier fired");
|
||||
}
|
||||
Err(err) => panic!("server B startup failed before the HTTP-bind barrier fired: {err}"),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let http = reqwest::Client::builder()
|
||||
.no_proxy()
|
||||
@@ -487,10 +502,9 @@ async fn second_embedded_server_fails_closed_until_its_context_slot_is_installed
|
||||
);
|
||||
|
||||
barrier.release();
|
||||
let server_b = tokio::time::timeout(Duration::from_secs(20), startup_b)
|
||||
let server_b = tokio::time::timeout(Duration::from_secs(20), startup_b.as_mut())
|
||||
.await
|
||||
.expect("server B startup must complete after releasing the barrier")
|
||||
.expect("server B startup task must not panic")
|
||||
.expect("start embedded server B");
|
||||
let client_b = s3_client(&server_b.endpoint(), server_b.access_key(), server_b.secret_key());
|
||||
client_b
|
||||
|
||||
@@ -12,6 +12,8 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#![recursion_limit = "256"]
|
||||
|
||||
use aws_sdk_s3::config::{Credentials, Region};
|
||||
use aws_sdk_s3::primitives::ByteStream;
|
||||
use aws_sdk_s3::{Client, Config};
|
||||
|
||||
Reference in New Issue
Block a user