From b9645eafeeb78c7e6289161ab128a1f304fa2b8a Mon Sep 17 00:00:00 2001 From: ikopylov Date: Fri, 29 Dec 2023 22:35:43 +0100 Subject: [PATCH 1/5] Update pearl to v0.9.6 --- CHANGELOG.md | 2 +- bob-backend/Cargo.toml | 2 +- bob/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f2d8f1f2..1d9f9af27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ Bob versions changelog #### Updated - +- Pearl updated to v0.9.6 () ## [v2.0.14-alpha.9] - 2023-10-19 diff --git a/bob-backend/Cargo.toml b/bob-backend/Cargo.toml index 2e391f67f..ab07ee0ed 100644 --- a/bob-backend/Cargo.toml +++ b/bob-backend/Cargo.toml @@ -35,7 +35,7 @@ tower = "0.4" tower-service = "0.3" [dependencies.pearl] -version = "=0.9.5" +version = "=0.9.6" [dependencies.tokio] version = "1.14" diff --git a/bob/Cargo.toml b/bob/Cargo.toml index e50d37fe8..7339835a1 100644 --- a/bob/Cargo.toml +++ b/bob/Cargo.toml @@ -40,7 +40,7 @@ tower = "0.4" tower-service = "0.3" [dependencies.pearl] -version = "=0.9.5" +version = "=0.9.6" [dependencies.tokio] version = "1.14" From ce74c9ba40d3b32128baee1734a26215a4fee633 Mon Sep 17 00:00:00 2001 From: ikopylov Date: Fri, 29 Dec 2023 22:39:06 +0100 Subject: [PATCH 2/5] Update Changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d9f9af27..fa944769c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ Bob versions changelog #### Updated -- Pearl updated to v0.9.6 () +- Pearl updated to v0.9.6 (#859) ## [v2.0.14-alpha.9] - 2023-10-19 From 5678ceb2019c07d40ad8a08e6de1276a108ce271 Mon Sep 17 00:00:00 2001 From: ikopylov Date: Fri, 29 Dec 2023 23:00:53 +0100 Subject: [PATCH 3/5] Fix build --- bob-backend/src/lib.rs | 3 +-- bob/Cargo.toml | 2 +- bob/src/api/http/s3.rs | 2 +- bob/src/lib.rs | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/bob-backend/src/lib.rs b/bob-backend/src/lib.rs index a78e1993e..aff8579dc 100755 --- a/bob-backend/src/lib.rs +++ b/bob-backend/src/lib.rs @@ -20,7 +20,6 @@ pub(crate) mod prelude { pub use anyhow::{Context, Result as AnyResult}; pub use bob_common::{ configs::{ - cluster::Cluster as ClusterConfig, node::{BackendType, Node as NodeConfig, Pearl as PearlConfig}, }, data::{BobData, BobKey, BobMeta, BobOptions, DiskPath, VDiskId}, @@ -36,7 +35,7 @@ pub(crate) mod prelude { Error as PearlError, ErrorKind as PearlErrorKind, Key as KeyTrait, Storage, }; pub use std::{ - collections::{hash_map::Entry, HashMap}, + collections::HashMap, convert::TryInto, fmt::{Debug, Display, Formatter, Result as FmtResult}, fs::Metadata, diff --git a/bob/Cargo.toml b/bob/Cargo.toml index 7339835a1..2d8a9cb28 100644 --- a/bob/Cargo.toml +++ b/bob/Cargo.toml @@ -28,7 +28,7 @@ metrics = { version = "0.17", features = ["std"] } mockall = "0.10.2" prost = "0.9" ring = "0.16" -rocket = { version = "0.5.0-rc.2", features = ["json", "uuid"] } +rocket = { version = "0.5.0", features = ["json", "uuid"] } serde = "1.0" serde_derive = "1.0" serde_yaml = "0.8" diff --git a/bob/src/api/http/s3.rs b/bob/src/api/http/s3.rs index 1e353a9aa..c099df5af 100644 --- a/bob/src/api/http/s3.rs +++ b/bob/src/api/http/s3.rs @@ -164,7 +164,7 @@ impl<'r> FromRequest<'r> for CopyObjectHeaders { .and_then(|x| x.parse().ok()) { Some(key) => key, - None => return Outcome::Forward(()), + None => return Outcome::Forward(Status::BadRequest), }; Outcome::Success(CopyObjectHeaders { if_modified_since: headers diff --git a/bob/src/lib.rs b/bob/src/lib.rs index 8de1a33d8..0d844875f 100644 --- a/bob/src/lib.rs +++ b/bob/src/lib.rs @@ -70,7 +70,6 @@ mod prelude { pub use std::{ collections::HashMap, fmt::{Debug, Formatter, Result as FmtResult}, - io::Write, pin::Pin, sync::Arc, time::{Duration, Instant}, From f7d318d58e2f7c7443ba71a7397e769139e57175 Mon Sep 17 00:00:00 2001 From: ikopylov Date: Fri, 29 Dec 2023 23:08:53 +0100 Subject: [PATCH 4/5] Fix build --- bob-backend/src/pearl/tests.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/bob-backend/src/pearl/tests.rs b/bob-backend/src/pearl/tests.rs index 90ae84926..50998d881 100755 --- a/bob-backend/src/pearl/tests.rs +++ b/bob-backend/src/pearl/tests.rs @@ -2,6 +2,7 @@ use crate::prelude::*; use super::{core::BackendResult, Pearl as PearlBackend}; use crate::core::{BackendStorage, Operation}; +use bob_common::configs::cluster::Cluster as ClusterConfig; static DISK_NAME: &str = "disk1"; static PEARL_PATH: &str = "/tmp/d1/"; From 8c5ed63a60d955ad8555ec9a9c279497d8cb2215 Mon Sep 17 00:00:00 2001 From: ikopylov Date: Fri, 29 Dec 2023 23:13:09 +0100 Subject: [PATCH 5/5] Fix build --- bob/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/bob/src/lib.rs b/bob/src/lib.rs index 0d844875f..a59c4eac3 100644 --- a/bob/src/lib.rs +++ b/bob/src/lib.rs @@ -91,6 +91,7 @@ pub(crate) mod test_utils { use chrono::Local; use env_logger::fmt::{Color, Formatter as EnvFormatter}; use log::{Level, Record}; + use std::io::Write; use std::io::Result as IOResult; use crate::prelude::*;