Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions crates/fluss/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ url = "2.5.7"
uuid = { version = "1.10", features = ["v4"] }
tempfile = "3.23.0"
snafu = "0.8.3"
scopeguard = "1.2.0"

[target.'cfg(target_arch = "wasm32")'.dependencies]
jiff = { workspace = true, features = ["js"] }
Expand Down
30 changes: 10 additions & 20 deletions crates/fluss/src/client/credentials.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,20 @@ fn convert_hadoop_key_to_opendal(hadoop_key: &str) -> Option<(String, bool)> {

pub struct CredentialsCache {
inner: RwLock<Option<CachedToken>>,
rpc_client: Arc<RpcClient>,
metadata: Arc<Metadata>,
}

impl CredentialsCache {
pub fn new() -> Self {
pub fn new(rpc_client: Arc<RpcClient>, metadata: Arc<Metadata>) -> Self {
Self {
inner: RwLock::new(None),
rpc_client,
metadata,
}
}

pub async fn get_or_refresh(
&self,
rpc_client: &Arc<RpcClient>,
metadata: &Arc<Metadata>,
) -> Result<HashMap<String, String>> {
pub async fn get_or_refresh(&self) -> Result<HashMap<String, String>> {
{
let guard = self.inner.read();
if let Some(cached) = guard.as_ref() {
Expand All @@ -113,17 +113,13 @@ impl CredentialsCache {
}
}

self.refresh_from_server(rpc_client, metadata).await
self.refresh_from_server().await
}

async fn refresh_from_server(
&self,
rpc_client: &Arc<RpcClient>,
metadata: &Arc<Metadata>,
) -> Result<HashMap<String, String>> {
let cluster = metadata.get_cluster();
async fn refresh_from_server(&self) -> Result<HashMap<String, String>> {
Comment thread
luoyuxia marked this conversation as resolved.
let cluster = self.metadata.get_cluster();
let server_node = cluster.get_one_available_server();
let conn = rpc_client.get_connection(server_node).await?;
let conn = self.rpc_client.get_connection(server_node).await?;

let request = GetSecurityTokenRequest::new();
let response = conn.request(request).await?;
Expand Down Expand Up @@ -158,9 +154,3 @@ impl CredentialsCache {
Ok(props)
}
}

impl Default for CredentialsCache {
fn default() -> Self {
Self::new()
}
}
Loading
Loading