gitdata.ai/gitks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(gateway): implement remote service forwarding for distributed git operations

Browse Source 
- Add remote client functions for archive, blame, and branch services
- Implement fallback logic to forward requests to remote storage nodes
- Add logging for forwarding operations with route details
- Update Cargo.lock with new dependencies including ractor cluster libraries
- Extend .gitignore with IDE and build system files
- Remove outdated comments from bare repository implementation
This commit is contained in:
zhenyi
2026-06-08 01:21:20 +08:00
parent 5b740eecd7
commit 5c99b27421
22 changed files with 2015 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/merge.rs
+70 -5
View File
@@ -1,7 +1,27 @@
use crate::pb::*;
use crate::pb::merge_service_client::MergeServiceClient;
use super::{GitksService, into_status};
async fn remote_merge_client(
svc: &GitksService,
header: Option<&RepositoryHeader>,
) -> Result<Option<MergeServiceClient<tonic::transport::Channel>>, tonic::Status> {
let header = match header {
Some(h) => h,
None => return Ok(None),
};
let Some(route) = svc.route_repository(header).await? else {
return Ok(None);
};
tracing::info!(storage_name = %route.storage_name, relative_path = %route.relative_path, actor_name = %route.actor_name, grpc_addr = %route.grpc_addr, "forwarding merge rpc");
let endpoint = super::remote_endpoint(&route.grpc_addr).await?;
let client = MergeServiceClient::connect(endpoint)
.await
.map_err(|e| tonic::Status::unavailable(e.to_string()))?;
Ok(Some(client))
}
#[tonic::async_trait]
impl merge_service_server::MergeService for GitksService {
async fn check_merge(
@@ -12,7 +32,16 @@ impl merge_service_server::MergeService for GitksService {
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("merge.check_merge", %repo);
let _enter = span.enter();
let gb = self.resolve(inner.repository.as_ref())?;
let gb = match self.resolve(inner.repository.as_ref()) {
Ok(gb) => gb,
Err(err) if err.code() == tonic::Code::NotFound => {
if let Some(mut client) = remote_merge_client(self, inner.repository.as_ref()).await? {
return client.check_merge(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
let resp = gb.check_merge(inner).map_err(into_status)?;
tracing::info!(%repo, status = resp.status, "check_merge done");
Ok(tonic::Response::new(resp))
@@ -27,7 +56,16 @@ impl merge_service_server::MergeService for GitksService {
let target = inner.target_branch.clone();
let span = tracing::info_span!("merge.merge", %repo, %target);
let _enter = span.enter();
let gb = self.resolve(inner.repository.as_ref())?;
let gb = match self.resolve(inner.repository.as_ref()) {
Ok(gb) => gb,
Err(err) if err.code() == tonic::Code::NotFound => {
if let Some(mut client) = remote_merge_client(self, inner.repository.as_ref()).await? {
return client.merge(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
let resp = gb.merge(inner).map_err(into_status)?;
tracing::info!(%repo, %target, status = resp.status, "merge done");
Ok(tonic::Response::new(resp))
@@ -41,7 +79,16 @@ impl merge_service_server::MergeService for GitksService {
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("merge.list_merge_conflicts", %repo);
let _enter = span.enter();
let gb = self.resolve(inner.repository.as_ref())?;
let gb = match self.resolve(inner.repository.as_ref()) {
Ok(gb) => gb,
Err(err) if err.code() == tonic::Code::NotFound => {
if let Some(mut client) = remote_merge_client(self, inner.repository.as_ref()).await? {
return client.list_merge_conflicts(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
let resp = gb.list_merge_conflicts(inner).map_err(into_status)?;
tracing::info!(%repo, conflicts = resp.conflicts.len(), "list_merge_conflicts done");
Ok(tonic::Response::new(resp))
@@ -56,7 +103,16 @@ impl merge_service_server::MergeService for GitksService {
let target = inner.target_branch.clone();
let span = tracing::info_span!("merge.resolve_merge_conflicts", %repo, %target);
let _enter = span.enter();
let gb = self.resolve(inner.repository.as_ref())?;
let gb = match self.resolve(inner.repository.as_ref()) {
Ok(gb) => gb,
Err(err) if err.code() == tonic::Code::NotFound => {
if let Some(mut client) = remote_merge_client(self, inner.repository.as_ref()).await? {
return client.resolve_merge_conflicts(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
let resp = gb.resolve_merge_conflicts(inner).map_err(into_status)?;
tracing::info!(%repo, %target, status = resp.status, "merge conflicts resolved");
Ok(tonic::Response::new(resp))
@@ -71,7 +127,16 @@ impl merge_service_server::MergeService for GitksService {
let branch = inner.branch.clone();
let span = tracing::info_span!("merge.rebase", %repo, %branch);
let _enter = span.enter();
let gb = self.resolve(inner.repository.as_ref())?;
let gb = match self.resolve(inner.repository.as_ref()) {
Ok(gb) => gb,
Err(err) if err.code() == tonic::Code::NotFound => {
if let Some(mut client) = remote_merge_client(self, inner.repository.as_ref()).await? {
return client.rebase(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
let resp = gb.rebase(inner).map_err(into_status)?;
tracing::info!(%repo, %branch, status = resp.status, "rebase done");
Ok(tonic::Response::new(resp))