- Refactor NamespaceLock to use a unified client vector and quorum mechanism, removing legacy local/distributed lock split and related code. - Update LockRequest to split timeout into acquire_timeout and ttl, and add builder methods for both. - Adjust all batch lock APIs to accept ttl and use new LockRequest fields. - Update all affected tests and documentation for the new API. Signed-off-by: junxiang Mu <[email protected]>
404 lines
16 KiB
Rust
404 lines
16 KiB
Rust
// Copyright 2024 RustFS Team
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use async_trait::async_trait;
|
|
use rustfs_protos::{
|
|
node_service_time_out_client,
|
|
proto_gen::node_service::{GenerallyLockRequest, PingRequest},
|
|
};
|
|
use std::collections::HashMap;
|
|
use std::sync::Arc;
|
|
use tokio::sync::RwLock;
|
|
use tonic::Request;
|
|
use tracing::info;
|
|
|
|
use crate::{
|
|
error::{LockError, Result},
|
|
types::{LockId, LockInfo, LockRequest, LockResponse, LockStats},
|
|
};
|
|
|
|
use super::LockClient;
|
|
|
|
/// Remote lock client implementation
|
|
#[derive(Debug)]
|
|
pub struct RemoteClient {
|
|
addr: String,
|
|
// Track active locks with their original owner information
|
|
active_locks: Arc<RwLock<HashMap<LockId, String>>>, // lock_id -> owner
|
|
}
|
|
|
|
impl Clone for RemoteClient {
|
|
fn clone(&self) -> Self {
|
|
Self {
|
|
addr: self.addr.clone(),
|
|
active_locks: self.active_locks.clone(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl RemoteClient {
|
|
pub fn new(endpoint: String) -> Self {
|
|
Self {
|
|
addr: endpoint,
|
|
active_locks: Arc::new(RwLock::new(HashMap::new())),
|
|
}
|
|
}
|
|
|
|
pub fn from_url(url: url::Url) -> Self {
|
|
Self {
|
|
addr: url.to_string(),
|
|
active_locks: Arc::new(RwLock::new(HashMap::new())),
|
|
}
|
|
}
|
|
|
|
/// Create a minimal LockRequest for unlock operations
|
|
fn create_unlock_request(&self, lock_id: &LockId, owner: &str) -> LockRequest {
|
|
LockRequest {
|
|
lock_id: lock_id.clone(),
|
|
resource: lock_id.resource.clone(),
|
|
lock_type: crate::types::LockType::Exclusive, // Type doesn't matter for unlock
|
|
owner: owner.to_string(),
|
|
acquire_timeout: std::time::Duration::from_secs(30),
|
|
ttl: std::time::Duration::from_secs(300),
|
|
metadata: crate::types::LockMetadata::default(),
|
|
priority: crate::types::LockPriority::Normal,
|
|
deadlock_detection: false,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl LockClient for RemoteClient {
|
|
async fn acquire_exclusive(&self, request: &LockRequest) -> Result<LockResponse> {
|
|
info!("remote acquire_exclusive for {}", request.resource);
|
|
let mut client = node_service_time_out_client(&self.addr)
|
|
.await
|
|
.map_err(|err| LockError::internal(format!("can not get client, err: {err}")))?;
|
|
let req = Request::new(GenerallyLockRequest {
|
|
args: serde_json::to_string(&request)
|
|
.map_err(|e| LockError::internal(format!("Failed to serialize request: {e}")))?,
|
|
});
|
|
let resp = client
|
|
.lock(req)
|
|
.await
|
|
.map_err(|e| LockError::internal(e.to_string()))?
|
|
.into_inner();
|
|
|
|
// Check for explicit error first
|
|
if let Some(error_info) = resp.error_info {
|
|
return Err(LockError::internal(error_info));
|
|
}
|
|
|
|
// Check if the lock acquisition was successful
|
|
if resp.success {
|
|
// Save the lock information for later release
|
|
let mut locks = self.active_locks.write().await;
|
|
locks.insert(request.lock_id.clone(), request.owner.clone());
|
|
|
|
Ok(LockResponse::success(
|
|
LockInfo {
|
|
id: request.lock_id.clone(),
|
|
resource: request.resource.clone(),
|
|
lock_type: request.lock_type,
|
|
status: crate::types::LockStatus::Acquired,
|
|
owner: request.owner.clone(),
|
|
acquired_at: std::time::SystemTime::now(),
|
|
expires_at: std::time::SystemTime::now() + request.ttl,
|
|
last_refreshed: std::time::SystemTime::now(),
|
|
metadata: request.metadata.clone(),
|
|
priority: request.priority,
|
|
wait_start_time: None,
|
|
},
|
|
std::time::Duration::ZERO,
|
|
))
|
|
} else {
|
|
// Lock acquisition failed
|
|
Ok(LockResponse::failure(
|
|
"Lock acquisition failed on remote server".to_string(),
|
|
std::time::Duration::ZERO,
|
|
))
|
|
}
|
|
}
|
|
|
|
async fn acquire_shared(&self, request: &LockRequest) -> Result<LockResponse> {
|
|
info!("remote acquire_shared for {}", request.resource);
|
|
let mut client = node_service_time_out_client(&self.addr)
|
|
.await
|
|
.map_err(|err| LockError::internal(format!("can not get client, err: {err}")))?;
|
|
let req = Request::new(GenerallyLockRequest {
|
|
args: serde_json::to_string(&request)
|
|
.map_err(|e| LockError::internal(format!("Failed to serialize request: {e}")))?,
|
|
});
|
|
let resp = client
|
|
.r_lock(req)
|
|
.await
|
|
.map_err(|e| LockError::internal(e.to_string()))?
|
|
.into_inner();
|
|
|
|
// Check for explicit error first
|
|
if let Some(error_info) = resp.error_info {
|
|
return Err(LockError::internal(error_info));
|
|
}
|
|
|
|
// Check if the lock acquisition was successful
|
|
if resp.success {
|
|
// Save the lock information for later release
|
|
let mut locks = self.active_locks.write().await;
|
|
locks.insert(request.lock_id.clone(), request.owner.clone());
|
|
|
|
Ok(LockResponse::success(
|
|
LockInfo {
|
|
id: request.lock_id.clone(),
|
|
resource: request.resource.clone(),
|
|
lock_type: request.lock_type,
|
|
status: crate::types::LockStatus::Acquired,
|
|
owner: request.owner.clone(),
|
|
acquired_at: std::time::SystemTime::now(),
|
|
expires_at: std::time::SystemTime::now() + request.ttl,
|
|
last_refreshed: std::time::SystemTime::now(),
|
|
metadata: request.metadata.clone(),
|
|
priority: request.priority,
|
|
wait_start_time: None,
|
|
},
|
|
std::time::Duration::ZERO,
|
|
))
|
|
} else {
|
|
// Lock acquisition failed
|
|
Ok(LockResponse::failure(
|
|
"Shared lock acquisition failed on remote server".to_string(),
|
|
std::time::Duration::ZERO,
|
|
))
|
|
}
|
|
}
|
|
|
|
async fn release(&self, lock_id: &LockId) -> Result<bool> {
|
|
info!("remote release for {}", lock_id);
|
|
|
|
// Get the original owner for this lock
|
|
let owner = {
|
|
let locks = self.active_locks.read().await;
|
|
locks.get(lock_id).cloned().unwrap_or_else(|| "remote".to_string())
|
|
};
|
|
|
|
let unlock_request = self.create_unlock_request(lock_id, &owner);
|
|
|
|
let request_string = serde_json::to_string(&unlock_request)
|
|
.map_err(|e| LockError::internal(format!("Failed to serialize request: {e}")))?;
|
|
let mut client = node_service_time_out_client(&self.addr)
|
|
.await
|
|
.map_err(|err| LockError::internal(format!("can not get client, err: {err}")))?;
|
|
|
|
// Try UnLock first (for exclusive locks)
|
|
let req = Request::new(GenerallyLockRequest {
|
|
args: request_string.clone(),
|
|
});
|
|
let resp = client.un_lock(req).await;
|
|
|
|
let success = if resp.is_err() {
|
|
// If that fails, try RUnLock (for shared locks)
|
|
let req = Request::new(GenerallyLockRequest { args: request_string });
|
|
let resp = client
|
|
.r_un_lock(req)
|
|
.await
|
|
.map_err(|e| LockError::internal(e.to_string()))?
|
|
.into_inner();
|
|
if let Some(error_info) = resp.error_info {
|
|
return Err(LockError::internal(error_info));
|
|
}
|
|
resp.success
|
|
} else {
|
|
let resp = resp.map_err(|e| LockError::internal(e.to_string()))?.into_inner();
|
|
|
|
if let Some(error_info) = resp.error_info {
|
|
return Err(LockError::internal(error_info));
|
|
}
|
|
resp.success
|
|
};
|
|
|
|
// Remove the lock from our tracking if successful
|
|
if success {
|
|
let mut locks = self.active_locks.write().await;
|
|
locks.remove(lock_id);
|
|
}
|
|
|
|
Ok(success)
|
|
}
|
|
|
|
async fn refresh(&self, lock_id: &LockId) -> Result<bool> {
|
|
info!("remote refresh for {}", lock_id);
|
|
let refresh_request = self.create_unlock_request(lock_id, "remote");
|
|
let mut client = node_service_time_out_client(&self.addr)
|
|
.await
|
|
.map_err(|err| LockError::internal(format!("can not get client, err: {err}")))?;
|
|
let req = Request::new(GenerallyLockRequest {
|
|
args: serde_json::to_string(&refresh_request)
|
|
.map_err(|e| LockError::internal(format!("Failed to serialize request: {e}")))?,
|
|
});
|
|
let resp = client
|
|
.refresh(req)
|
|
.await
|
|
.map_err(|e| LockError::internal(e.to_string()))?
|
|
.into_inner();
|
|
if let Some(error_info) = resp.error_info {
|
|
return Err(LockError::internal(error_info));
|
|
}
|
|
Ok(resp.success)
|
|
}
|
|
|
|
async fn force_release(&self, lock_id: &LockId) -> Result<bool> {
|
|
info!("remote force_release for {}", lock_id);
|
|
let force_request = self.create_unlock_request(lock_id, "remote");
|
|
let mut client = node_service_time_out_client(&self.addr)
|
|
.await
|
|
.map_err(|err| LockError::internal(format!("can not get client, err: {err}")))?;
|
|
let req = Request::new(GenerallyLockRequest {
|
|
args: serde_json::to_string(&force_request)
|
|
.map_err(|e| LockError::internal(format!("Failed to serialize request: {e}")))?,
|
|
});
|
|
let resp = client
|
|
.force_un_lock(req)
|
|
.await
|
|
.map_err(|e| LockError::internal(e.to_string()))?
|
|
.into_inner();
|
|
if let Some(error_info) = resp.error_info {
|
|
return Err(LockError::internal(error_info));
|
|
}
|
|
Ok(resp.success)
|
|
}
|
|
|
|
async fn check_status(&self, lock_id: &LockId) -> Result<Option<LockInfo>> {
|
|
info!("remote check_status for {}", lock_id);
|
|
|
|
// Since there's no direct status query in the gRPC service,
|
|
// we attempt a non-blocking lock acquisition to check if the resource is available
|
|
let status_request = self.create_unlock_request(lock_id, "remote");
|
|
let mut client = node_service_time_out_client(&self.addr)
|
|
.await
|
|
.map_err(|err| LockError::internal(format!("can not get client, err: {err}")))?;
|
|
|
|
// Try to acquire a very short-lived lock to test availability
|
|
let req = Request::new(GenerallyLockRequest {
|
|
args: serde_json::to_string(&status_request)
|
|
.map_err(|e| LockError::internal(format!("Failed to serialize request: {e}")))?,
|
|
});
|
|
|
|
// Try exclusive lock first with very short timeout
|
|
let resp = client.lock(req).await;
|
|
|
|
match resp {
|
|
Ok(response) => {
|
|
let resp = response.into_inner();
|
|
if resp.success {
|
|
// If we successfully acquired the lock, the resource was free
|
|
// Immediately release it
|
|
let release_req = Request::new(GenerallyLockRequest {
|
|
args: serde_json::to_string(&status_request)
|
|
.map_err(|e| LockError::internal(format!("Failed to serialize request: {e}")))?,
|
|
});
|
|
let _ = client.un_lock(release_req).await; // Best effort release
|
|
|
|
// Return None since no one was holding the lock
|
|
Ok(None)
|
|
} else {
|
|
// Lock acquisition failed, meaning someone is holding it
|
|
// We can't determine the exact details remotely, so return a generic status
|
|
Ok(Some(LockInfo {
|
|
id: lock_id.clone(),
|
|
resource: lock_id.as_str().to_string(),
|
|
lock_type: crate::types::LockType::Exclusive, // We can't know the exact type
|
|
status: crate::types::LockStatus::Acquired,
|
|
owner: "unknown".to_string(), // Remote client can't determine owner
|
|
acquired_at: std::time::SystemTime::now(),
|
|
expires_at: std::time::SystemTime::now() + std::time::Duration::from_secs(3600),
|
|
last_refreshed: std::time::SystemTime::now(),
|
|
metadata: crate::types::LockMetadata::default(),
|
|
priority: crate::types::LockPriority::Normal,
|
|
wait_start_time: None,
|
|
}))
|
|
}
|
|
}
|
|
Err(_) => {
|
|
// Communication error or lock is held
|
|
Ok(Some(LockInfo {
|
|
id: lock_id.clone(),
|
|
resource: lock_id.as_str().to_string(),
|
|
lock_type: crate::types::LockType::Exclusive,
|
|
status: crate::types::LockStatus::Acquired,
|
|
owner: "unknown".to_string(),
|
|
acquired_at: std::time::SystemTime::now(),
|
|
expires_at: std::time::SystemTime::now() + std::time::Duration::from_secs(3600),
|
|
last_refreshed: std::time::SystemTime::now(),
|
|
metadata: crate::types::LockMetadata::default(),
|
|
priority: crate::types::LockPriority::Normal,
|
|
wait_start_time: None,
|
|
}))
|
|
}
|
|
}
|
|
}
|
|
|
|
async fn get_stats(&self) -> Result<LockStats> {
|
|
info!("remote get_stats from {}", self.addr);
|
|
|
|
// Since there's no direct statistics endpoint in the gRPC service,
|
|
// we return basic stats indicating this is a remote client
|
|
let stats = LockStats {
|
|
last_updated: std::time::SystemTime::now(),
|
|
..Default::default()
|
|
};
|
|
|
|
// We could potentially enhance this by:
|
|
// 1. Keeping local counters of operations performed
|
|
// 2. Adding a stats gRPC method to the service
|
|
// 3. Querying server health endpoints
|
|
|
|
// For now, return minimal stats indicating remote connectivity
|
|
Ok(stats)
|
|
}
|
|
|
|
async fn close(&self) -> Result<()> {
|
|
Ok(())
|
|
}
|
|
|
|
async fn is_online(&self) -> bool {
|
|
// Use Ping interface to test if remote service is online
|
|
let mut client = match node_service_time_out_client(&self.addr).await {
|
|
Ok(client) => client,
|
|
Err(_) => {
|
|
info!("remote client {} connection failed", self.addr);
|
|
return false;
|
|
}
|
|
};
|
|
|
|
let ping_req = Request::new(PingRequest {
|
|
version: 1,
|
|
body: bytes::Bytes::new(),
|
|
});
|
|
|
|
match client.ping(ping_req).await {
|
|
Ok(_) => {
|
|
info!("remote client {} is online", self.addr);
|
|
true
|
|
}
|
|
Err(_) => {
|
|
info!("remote client {} ping failed", self.addr);
|
|
false
|
|
}
|
|
}
|
|
}
|
|
|
|
async fn is_local(&self) -> bool {
|
|
false
|
|
}
|
|
}
|