Skip to content

fix(catalog/rest): Using async lock in token to avoid blocking runtime #1223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 16, 2025
Merged

fix(catalog/rest): Using async lock in token to avoid blocking runtime #1223

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2677223
fix: Using async lock in token to avoid blocking runtime
Xuanwo Apr 16, 2025
9916c75
Merge branch 'main' into use-async-lock-in-rest
liurenjie1024 Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions crates/catalog/rest/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

use std::collections::HashMap;
use std::fmt::{Debug, Formatter};
use std::sync::Mutex;

use http::StatusCode;
use iceberg::{Error, ErrorKind, Result};
use reqwest::header::HeaderMap;
use reqwest::{Client, IntoUrl, Method, Request, RequestBuilder, Response};
use serde::de::DeserializeOwned;
use tokio::sync::Mutex;

use crate::types::{ErrorResponse, TokenResponse};
use crate::RestCatalogConfig;
Expand Down Expand Up @@ -79,10 +79,7 @@ impl HttpClient {
.unwrap_or(self.extra_headers);
Ok(HttpClient {
client: cfg.client().unwrap_or(self.client),
token: Mutex::new(
cfg.token()
.or_else(|| self.token.into_inner().ok().flatten()),
),
token: Mutex::new(cfg.token().or_else(|| self.token.into_inner())),
token_endpoint: (!cfg.get_token_endpoint().is_empty())
.then(|| cfg.get_token_endpoint())
.unwrap_or(self.token_endpoint),
Expand All @@ -102,7 +99,7 @@ impl HttpClient {
.build()
.unwrap();
self.authenticate(&mut req).await.ok();
self.token.lock().unwrap().clone()
self.token.lock().await.clone()
}

/// Authenticate the request by filling token.
Expand All @@ -116,7 +113,7 @@ impl HttpClient {
/// Support refreshing token while needed.
async fn authenticate(&self, req: &mut Request) -> Result<()> {
// Clone the token from lock without holding the lock for entire function.
let token = { self.token.lock().expect("lock poison").clone() };
let token = self.token.lock().await.clone();

if self.credential.is_none() && token.is_none() {
return Ok(());
Expand Down Expand Up @@ -197,7 +194,7 @@ impl HttpClient {
}?;
let token = auth_res.access_token;
// Update token.
*self.token.lock().expect("lock poison") = Some(token.clone());
*self.token.lock().await = Some(token.clone());
// Insert token in request.
req.headers_mut().insert(
http::header::AUTHORIZATION,
Expand Down
Loading