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/repository.rs
+141 -12
View File
@@ -1,6 +1,26 @@
use crate::pb::*;
use crate::pb::repository_service_client::RepositoryServiceClient;
use super::{GitksService, git_cmd, into_status, repository_maint};
use super::{GitksService, git_cmd, into_status, repository_maint, remote_endpoint};
async fn remote_repository_client(
svc: &GitksService,
header: Option<&RepositoryHeader>,
) -> Result<Option<RepositoryServiceClient<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 repository rpc");
let endpoint = remote_endpoint(&route.grpc_addr).await?;
let client = RepositoryServiceClient::connect(endpoint)
.await
.map_err(|e| tonic::Status::unavailable(e.to_string()))?;
Ok(Some(client))
}
fn default_branch_name(gb: &crate::bare::GitBare) -> String {
git_cmd(gb, &["symbolic-ref", "HEAD"])
@@ -24,7 +44,16 @@ impl repository_service_server::RepositoryService for GitksService {
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("repo.get_repository", %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_repository_client(self, inner.repository.as_ref()).await? {
return client.get_repository(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
let bare = gb.bare_dir.join("HEAD").exists();
let object_format = gb.object_format();
Ok(tonic::Response::new(Repository {
@@ -64,6 +93,11 @@ impl repository_service_server::RepositoryService for GitksService {
let span = tracing::info_span!("repo.delete_repository", %repo);
let _enter = span.enter();
let bare_dir = self.resolve_for_init(inner.repository.as_ref())?;
if !bare_dir.exists() {
if let Some(mut client) = remote_repository_client(self, inner.repository.as_ref()).await? {
return client.delete_repository(inner).await;
}
}
tracing::warn!(%repo, path = %bare_dir.display(), "deleting repository");
std::fs::remove_dir_all(&bare_dir).map_err(|e| tonic::Status::internal(e.to_string()))?;
tracing::info!(%repo, "repository deleted");
@@ -80,6 +114,11 @@ impl repository_service_server::RepositoryService for GitksService {
let _enter = span.enter();
let bare_dir = self.resolve_for_init(inner.repository.as_ref())?;
let exists = bare_dir.exists() && bare_dir.is_dir() && bare_dir.join("HEAD").exists();
if !exists {
if let Some(mut client) = remote_repository_client(self, inner.repository.as_ref()).await? {
return client.repository_exists(inner).await;
}
}
Ok(tonic::Response::new(RepositoryExistsResponse { exists }))
}
@@ -91,7 +130,16 @@ impl repository_service_server::RepositoryService for GitksService {
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("repo.get_object_format", %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_repository_client(self, inner.repository.as_ref()).await? {
return client.get_object_format(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
Ok(tonic::Response::new(RepositoryObjectFormatResponse {
object_format: gb.object_format() as i32,
}))
@@ -105,7 +153,16 @@ impl repository_service_server::RepositoryService for GitksService {
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("repo.get_default_branch", %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_repository_client(self, inner.repository.as_ref()).await? {
return client.get_default_branch(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
Ok(tonic::Response::new(GetDefaultBranchResponse {
name: default_branch_name(&gb),
}))
@@ -120,7 +177,16 @@ impl repository_service_server::RepositoryService for GitksService {
let name = inner.name.clone();
let span = tracing::info_span!("repo.set_default_branch", %repo, %name);
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_repository_client(self, inner.repository.as_ref()).await? {
return client.set_default_branch(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
let refname = format!("refs/heads/{}", inner.name);
let out = git_cmd(&gb, &["symbolic-ref", "HEAD", &refname])?;
if !out.status.success() {
@@ -140,7 +206,16 @@ impl repository_service_server::RepositoryService for GitksService {
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("repo.get_repository_config", %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_repository_client(self, inner.repository.as_ref()).await? {
return client.get_repository_config(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
let mut entries = Vec::new();
if inner.keys.is_empty() {
let out = git_cmd(&gb, &["config", "--list"])?;
@@ -188,7 +263,16 @@ impl repository_service_server::RepositoryService for GitksService {
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("repo.set_repository_config", %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_repository_client(self, inner.repository.as_ref()).await? {
return client.set_repository_config(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
for entry in &inner.entries {
if entry.values.is_empty() {
git_cmd(&gb, &["config", "--unset-all", &entry.key])?;
@@ -213,7 +297,16 @@ impl repository_service_server::RepositoryService for GitksService {
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("repo.get_repository_statistics", %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_repository_client(self, inner.repository.as_ref()).await? {
return client.get_repository_statistics(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
Ok(tonic::Response::new(repository_maint::get_statistics(&gb)))
}
@@ -225,7 +318,16 @@ impl repository_service_server::RepositoryService for GitksService {
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("repo.check_repository_health", %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_repository_client(self, inner.repository.as_ref()).await? {
return client.check_repository_health(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
let resp = repository_maint::check_health(&gb, inner.connectivity_only)?;
tracing::info!(%repo, ok = resp.ok, errors = resp.errors.len(), warnings = resp.warnings.len(), "health check done");
Ok(tonic::Response::new(resp))
@@ -239,7 +341,16 @@ impl repository_service_server::RepositoryService for GitksService {
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("repo.garbage_collect", %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_repository_client(self, inner.repository.as_ref()).await? {
return client.garbage_collect(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
let resp = repository_maint::run_gc(&gb, inner.prune, inner.aggressive)?;
tracing::info!(%repo, ok = resp.ok, "gc done");
Ok(tonic::Response::new(resp))
@@ -253,7 +364,16 @@ impl repository_service_server::RepositoryService for GitksService {
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("repo.repack", %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_repository_client(self, inner.repository.as_ref()).await? {
return client.repack(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
let resp = repository_maint::run_repack(
&gb,
inner.full,
@@ -272,7 +392,16 @@ impl repository_service_server::RepositoryService for GitksService {
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("repo.write_commit_graph", %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_repository_client(self, inner.repository.as_ref()).await? {
return client.write_commit_graph(inner).await;
}
return Err(err);
}
Err(err) => return Err(err),
};
let resp = repository_maint::run_commit_graph_write(&gb, inner.split, inner.replace)?;
tracing::info!(%repo, ok = resp.ok, "commit-graph write done");
Ok(tonic::Response::new(resp))