From 78f9d8e560d1ee878988dfaa73549ae694b831d3 Mon Sep 17 00:00:00 2001 From: asonix Date: Sun, 9 Jun 2024 12:06:05 -0500 Subject: [PATCH 1/2] Update opentelemetry to 0.23 --- Cargo.lock | 36 +++++++++++------------------------- Cargo.toml | 10 +++++----- 2 files changed, 16 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e3e5c63..91bc995 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1809,9 +1809,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opentelemetry" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" +checksum = "1b69a91d4893e713e06f724597ad630f1fa76057a5e1026c0ca67054a9032a76" dependencies = [ "futures-core", "futures-sink", @@ -1819,21 +1819,19 @@ dependencies = [ "once_cell", "pin-project-lite", "thiserror", - "urlencoding", ] [[package]] name = "opentelemetry-otlp" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb" +checksum = "a94c69209c05319cdf7460c6d4c055ed102be242a0a6245835d7bc42c6ec7f54" dependencies = [ "async-trait", "futures-core", "http 0.2.12", "opentelemetry", "opentelemetry-proto", - "opentelemetry-semantic-conventions", "opentelemetry_sdk", "prost", "thiserror", @@ -1843,9 +1841,9 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4" +checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162" dependencies = [ "opentelemetry", "opentelemetry_sdk", @@ -1853,24 +1851,18 @@ dependencies = [ "tonic 0.11.0", ] -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910" - [[package]] name = "opentelemetry_sdk" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" +checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd" dependencies = [ "async-trait", - "crossbeam-channel", "futures-channel", "futures-executor", "futures-util", "glob", + "lazy_static", "once_cell", "opentelemetry", "ordered-float", @@ -3376,9 +3368,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" +checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4" dependencies = [ "js-sys", "once_cell", @@ -3486,12 +3478,6 @@ dependencies = [ "serde", ] -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - [[package]] name = "utf8parse" version = "0.2.2" diff --git a/Cargo.toml b/Cargo.toml index 3c37207..03d55d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,9 +41,9 @@ metrics = "0.22.0" metrics-exporter-prometheus = { version = "0.14.0", default-features = false, features = ["http-listener"] } mime = "0.3.1" nanorand = { version = "0.7", optional = true } -opentelemetry_sdk = { version = "0.22", features = ["rt-tokio"] } -opentelemetry = "0.22" -opentelemetry-otlp = "0.15" +opentelemetry_sdk = { version = "0.23", features = ["rt-tokio"] } +opentelemetry = "0.23" +opentelemetry-otlp = "0.16" pin-project-lite = "0.2.7" refinery = { version = "0.8.10", features = ["tokio-postgres", "postgres"] } reqwest = { version = "0.12.0", default-features = false, features = ["json", "rustls-tls", "stream"] } @@ -79,7 +79,7 @@ toml = "0.8.0" tracing = "0.1.15" tracing-error = "0.2.0" tracing-log = "0.2.0" -tracing-opentelemetry = "0.23" +tracing-opentelemetry = "0.24" tracing-subscriber = { version = "0.3.0", features = [ "ansi", "env-filter", @@ -96,4 +96,4 @@ webpki-roots = "0.26.0" [dependencies.tracing-actix-web] version = "0.7.10" default-features = false -features = ["opentelemetry_0_22"] +features = ["opentelemetry_0_23"] From 9af7e01b0152318d0fa939d615daf653be43f430 Mon Sep 17 00:00:00 2001 From: asonix Date: Sun, 9 Jun 2024 14:44:18 -0500 Subject: [PATCH 2/2] Better handle concurrent proxies --- src/lib.rs | 28 ++++++++++++++++++++++++---- src/repo.rs | 14 ++++++++++++-- src/repo/postgres.rs | 24 +++++++++++++++++------- src/repo/sled.rs | 28 ++++++++++++++++++++-------- 4 files changed, 73 insertions(+), 21 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 6fb89d9..9f68624 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -74,7 +74,10 @@ use self::{ middleware::{Deadline, Internal, Log, Metrics, Payload}, migrate_store::migrate_store, queue::queue_generate, - repo::{sled::SledRepo, Alias, ArcRepo, DeleteToken, Hash, Repo, UploadId, UploadResult}, + repo::{ + sled::SledRepo, Alias, ArcRepo, DeleteToken, Hash, ProxyAlreadyExists, Repo, UploadId, + UploadResult, + }, serde_str::Serde, state::State, store::{file_store::FileStore, object_store::ObjectStore, Store}, @@ -1286,11 +1289,28 @@ async fn proxy_alias_from_query( } else if !state.config.server.read_only { let stream = download_stream(proxy.as_str(), state).await?; - let (alias, _, _) = ingest_inline(stream, state, &Default::default()).await?; + // some time has passed, see if we've proxied elsewhere + if let Some(alias) = state.repo.related(proxy.clone()).await? { + alias + } else { + let (alias, token, _) = + ingest_inline(stream, state, &Default::default()).await?; - state.repo.relate_url(proxy, alias.clone()).await?; + // last check, do we succeed or fail to relate the proxy alias + if let Err(ProxyAlreadyExists) = + state.repo.relate_url(proxy.clone(), alias.clone()).await? + { + queue::cleanup_alias(&state.repo, alias, token).await?; - alias + state + .repo + .related(proxy) + .await? + .ok_or(UploadError::MissingAlias)? + } else { + alias + } + } } else { return Err(UploadError::ReadOnly.into()); }; diff --git a/src/repo.rs b/src/repo.rs index dfe3fcb..4d01c84 100644 --- a/src/repo.rs +++ b/src/repo.rs @@ -46,6 +46,8 @@ pub(crate) struct HashAlreadyExists; pub(crate) struct AliasAlreadyExists; #[derive(Debug)] pub(crate) struct VariantAlreadyExists; +#[derive(Debug)] +pub(crate) struct ProxyAlreadyExists; #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] pub(crate) struct UploadId { @@ -151,7 +153,11 @@ impl BaseRepo for Arc where T: BaseRepo {} #[async_trait::async_trait(?Send)] pub(crate) trait ProxyRepo: BaseRepo { - async fn relate_url(&self, url: Url, alias: Alias) -> Result<(), RepoError>; + async fn relate_url( + &self, + url: Url, + alias: Alias, + ) -> Result, RepoError>; async fn related(&self, url: Url) -> Result, RepoError>; @@ -163,7 +169,11 @@ impl ProxyRepo for Arc where T: ProxyRepo, { - async fn relate_url(&self, url: Url, alias: Alias) -> Result<(), RepoError> { + async fn relate_url( + &self, + url: Url, + alias: Alias, + ) -> Result, RepoError> { T::relate_url(self, url, alias).await } diff --git a/src/repo/postgres.rs b/src/repo/postgres.rs index 51a6a6a..edd9fc8 100644 --- a/src/repo/postgres.rs +++ b/src/repo/postgres.rs @@ -47,8 +47,8 @@ use super::{ notification_map::{NotificationEntry, NotificationMap}, Alias, AliasAccessRepo, AliasAlreadyExists, AliasRepo, BaseRepo, DeleteToken, DetailsRepo, FullRepo, Hash, HashAlreadyExists, HashPage, HashRepo, JobId, JobResult, OrderedHash, - ProxyRepo, QueueRepo, RepoError, SettingsRepo, StoreMigrationRepo, UploadId, UploadRepo, - UploadResult, VariantAccessRepo, VariantAlreadyExists, VariantRepo, + ProxyAlreadyExists, ProxyRepo, QueueRepo, RepoError, SettingsRepo, StoreMigrationRepo, + UploadId, UploadRepo, UploadResult, VariantAccessRepo, VariantAlreadyExists, VariantRepo, }; #[derive(Clone)] @@ -1884,21 +1884,31 @@ impl StoreMigrationRepo for PostgresRepo { #[async_trait::async_trait(?Send)] impl ProxyRepo for PostgresRepo { #[tracing::instrument(level = "debug", skip(self))] - async fn relate_url(&self, input_url: Url, input_alias: Alias) -> Result<(), RepoError> { + async fn relate_url( + &self, + input_url: Url, + input_alias: Alias, + ) -> Result, RepoError> { use schema::proxies::dsl::*; let mut conn = self.get_connection().await?; - diesel::insert_into(proxies) + let res = diesel::insert_into(proxies) .values((url.eq(input_url.as_str()), alias.eq(&input_alias))) .execute(&mut conn) .with_metrics(crate::init_metrics::POSTGRES_PROXY_RELATE_URL) .with_timeout(Duration::from_secs(5)) .await - .map_err(|_| PostgresError::DbTimeout)? - .map_err(PostgresError::Diesel)?; + .map_err(|_| PostgresError::DbTimeout)?; - Ok(()) + match res { + Ok(_) => Ok(Ok(())), + Err(diesel::result::Error::DatabaseError( + diesel::result::DatabaseErrorKind::UniqueViolation, + _, + )) => Ok(Err(ProxyAlreadyExists)), + Err(e) => Err(PostgresError::Diesel(e).into()), + } } #[tracing::instrument(level = "debug", skip(self))] diff --git a/src/repo/sled.rs b/src/repo/sled.rs index af0e2cd..6f1a553 100644 --- a/src/repo/sled.rs +++ b/src/repo/sled.rs @@ -26,8 +26,8 @@ use super::{ notification_map::{NotificationEntry, NotificationMap}, Alias, AliasAccessRepo, AliasAlreadyExists, AliasRepo, BaseRepo, DeleteToken, Details, DetailsRepo, FullRepo, HashAlreadyExists, HashPage, HashRepo, JobId, JobResult, OrderedHash, - ProxyRepo, QueueRepo, RepoError, SettingsRepo, StoreMigrationRepo, UploadId, UploadRepo, - UploadResult, VariantAccessRepo, VariantAlreadyExists, VariantRepo, + ProxyAlreadyExists, ProxyRepo, QueueRepo, RepoError, SettingsRepo, StoreMigrationRepo, + UploadId, UploadRepo, UploadResult, VariantAccessRepo, VariantAlreadyExists, VariantRepo, }; macro_rules! b { @@ -218,20 +218,32 @@ impl FullRepo for SledRepo { #[async_trait::async_trait(?Send)] impl ProxyRepo for SledRepo { - async fn relate_url(&self, url: Url, alias: Alias) -> Result<(), RepoError> { + async fn relate_url( + &self, + url: Url, + alias: Alias, + ) -> Result, RepoError> { let proxy = self.proxy.clone(); let inverse_proxy = self.inverse_proxy.clone(); - crate::sync::spawn_blocking("sled-io", move || { - proxy.insert(url.as_str().as_bytes(), alias.to_bytes())?; - inverse_proxy.insert(alias.to_bytes(), url.as_str().as_bytes())?; + let res = crate::sync::spawn_blocking("sled-io", move || { + match proxy.compare_and_swap( + url.as_str().as_bytes(), + Option::::None, + Some(alias.to_bytes()), + )? { + Ok(_) => { + inverse_proxy.insert(alias.to_bytes(), url.as_str().as_bytes())?; - Ok(()) as Result<(), SledError> + Ok(Ok(())) as Result, SledError> + } + Err(_) => Ok(Err(ProxyAlreadyExists)), + } }) .await .map_err(|_| RepoError::Canceled)??; - Ok(()) + Ok(res) } async fn related(&self, url: Url) -> Result, RepoError> {