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

feat(cluster): implement distributed clustering with etcd coordination

Browse Source 
- Integrate etcd-client for distributed coordination and leader election
- Add remote client macros with proper formatting for all services
- Implement RequestMetrics for tracking RPC performance and errors
- Add rate limiting mechanism across all service endpoints
- Create ElectionRequest and ElectionResult message types for leader election
- Add role management with primary/replica switching capabilities
- Implement health checker with automatic failover detection
- Add repository count metrics for cluster monitoring
- Update Cargo.toml with etcd-client and dashmap dependencies
- Modify RepoEntry to include read_only flag for replica handling
- Implement should_accept_election logic to prevent duplicate elections
- Add RoleChangedEvent handling for cluster role updates
This commit is contained in:
zhenyi
2026-06-08 14:31:29 +08:00
parent d243dce027
commit 8f472a0443
37 changed files with 4691 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/pack.rs
+162 -8
View File
@@ -6,7 +6,11 @@ use crate::pb::*;
use super::{GitksService, into_status};
remote_client!(remote_pack_client, PackServiceClient<tonic::transport::Channel>, "pack");
remote_client!(
remote_pack_client,
PackServiceClient<tonic::transport::Channel>,
"pack"
);
#[tonic::async_trait]
impl pack_service_server::PackService for GitksService {
@@ -18,7 +22,9 @@ impl pack_service_server::PackService for GitksService {
&self,
request: tonic::Request<AdvertiseRefsRequest>,
) -> Result<tonic::Response<AdvertiseRefsResponse>, tonic::Status> {
let m = crate::metrics::RequestMetrics::new("gitks.PackService/AdvertiseRefs");
let inner = request.into_inner();
let _rate = self.acquire_rate_limit(inner.repository.as_ref()).await?;
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("pack.advertise_refs", %repo);
let _enter = span.enter();
@@ -28,14 +34,37 @@ impl pack_service_server::PackService for GitksService {
if let Some(mut client) =
remote_pack_client(self, inner.repository.as_ref(), false).await?
{
m.record("ok");
return client.advertise_refs(inner).await;
}
crate::metrics::record_rpc_error(&m, &err);
return Err(err);
}
Err(err) => {
crate::metrics::record_rpc_error(&m, &err);
return Err(err);
}
Err(err) => return Err(err),
};
if let Some(ref pc) = self.pack_cache {
let protocol = inner.service.clone();
if let Ok(digest) = pc.disk_cache().compute_info_refs_key(&repo, &protocol) {
if let Some(cached) = pc.lookup_info_refs::<AdvertiseRefsResponse>(&digest) {
tracing::info!(%repo, refs = cached.references.len(), "advertise_refs done (cached)");
m.record("ok");
return Ok(tonic::Response::new(cached));
}
let resp = gb.advertise_refs(inner).map_err(into_status)?;
pc.store_info_refs(&digest, &resp);
tracing::info!(%repo, refs = resp.references.len(), "advertise_refs done (written to cache)");
m.record("ok");
return Ok(tonic::Response::new(resp));
}
}
let resp = gb.advertise_refs(inner).map_err(into_status)?;
tracing::info!(%repo, refs = resp.references.len(), "advertise_refs done");
m.record("ok");
Ok(tonic::Response::new(resp))
}
@@ -43,11 +72,13 @@ impl pack_service_server::PackService for GitksService {
&self,
request: tonic::Request<tonic::Streaming<UploadPackRequest>>,
) -> Result<tonic::Response<Self::UploadPackStream>, tonic::Status> {
let m = crate::metrics::RequestMetrics::new("gitks.PackService/UploadPack");
let mut stream = request.into_inner();
let first = stream
.next()
.await
.ok_or_else(|| tonic::Status::invalid_argument("empty upload-pack stream"))??;
let _rate = self.acquire_rate_limit(first.repository.as_ref()).await?;
let repo = self.repo_label(first.repository.as_ref());
let span = tracing::info_span!("pack.upload_pack", %repo);
let _enter = span.enter();
@@ -57,6 +88,7 @@ impl pack_service_server::PackService for GitksService {
if let Some(mut client) =
remote_pack_client(self, first.repository.as_ref(), false).await?
{
m.record("ok");
let (tx, rx) = tokio::sync::mpsc::channel(16);
let _ = tx.send(first).await;
tokio::spawn(async move {
@@ -78,9 +110,13 @@ impl pack_service_server::PackService for GitksService {
let out = super::bridge_server_stream(resp.into_inner());
return Ok(tonic::Response::new(out));
}
crate::metrics::record_rpc_error(&m, &err);
return Err(err);
}
Err(err) => {
crate::metrics::record_rpc_error(&m, &err);
return Err(err);
}
Err(err) => return Err(err),
};
tracing::info!(%repo, "upload-pack streaming started");
@@ -97,6 +133,7 @@ impl pack_service_server::PackService for GitksService {
});
let result = gb.upload_pack(ReceiverStream::new(rx)).await?;
m.record("ok");
Ok(tonic::Response::new(result))
}
@@ -104,11 +141,13 @@ impl pack_service_server::PackService for GitksService {
&self,
request: tonic::Request<tonic::Streaming<ReceivePackRequest>>,
) -> Result<tonic::Response<Self::ReceivePackStream>, tonic::Status> {
let m = crate::metrics::RequestMetrics::new("gitks.PackService/ReceivePack");
let mut stream = request.into_inner();
let first = stream
.next()
.await
.ok_or_else(|| tonic::Status::invalid_argument("empty receive-pack stream"))??;
let _rate = self.acquire_rate_limit(first.repository.as_ref()).await?;
let repo = self.repo_label(first.repository.as_ref());
let span = tracing::info_span!("pack.receive_pack", %repo);
let _enter = span.enter();
@@ -118,6 +157,7 @@ impl pack_service_server::PackService for GitksService {
if let Some(mut client) =
remote_pack_client(self, first.repository.as_ref(), false).await?
{
m.record("ok");
let (tx, rx) = tokio::sync::mpsc::channel(16);
let _ = tx.send(first).await;
tokio::spawn(async move {
@@ -139,9 +179,13 @@ impl pack_service_server::PackService for GitksService {
let out = super::bridge_server_stream(resp.into_inner());
return Ok(tonic::Response::new(out));
}
crate::metrics::record_rpc_error(&m, &err);
return Err(err);
}
Err(err) => {
crate::metrics::record_rpc_error(&m, &err);
return Err(err);
}
Err(err) => return Err(err),
};
tracing::info!(%repo, "receive-pack streaming started");
@@ -158,6 +202,7 @@ impl pack_service_server::PackService for GitksService {
});
let result = gb.receive_pack(ReceiverStream::new(rx)).await?;
m.record("ok");
Ok(tonic::Response::new(result))
}
@@ -165,7 +210,9 @@ impl pack_service_server::PackService for GitksService {
&self,
request: tonic::Request<PackObjectsRequest>,
) -> Result<tonic::Response<Self::PackObjectsStream>, tonic::Status> {
let m = crate::metrics::RequestMetrics::new("gitks.PackService/PackObjects");
let inner = request.into_inner();
let _rate = self.acquire_rate_limit(inner.repository.as_ref()).await?;
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("pack.pack_objects", %repo);
let _enter = span.enter();
@@ -175,16 +222,97 @@ impl pack_service_server::PackService for GitksService {
if let Some(mut client) =
remote_pack_client(self, inner.repository.as_ref(), false).await?
{
m.record("ok");
let resp = client.pack_objects(inner).await?;
let stream = super::bridge_server_stream(resp.into_inner());
return Ok(tonic::Response::new(stream));
}
crate::metrics::record_rpc_error(&m, &err);
return Err(err);
}
Err(err) => {
crate::metrics::record_rpc_error(&m, &err);
return Err(err);
}
Err(err) => return Err(err),
};
if let Some(ref pc) = self.pack_cache
&& let Some(opts) = inner.options.as_ref()
{
let wants_hex: Vec<String> = opts.wants.iter().map(|w| w.hex.clone()).collect();
let haves_hex: Vec<String> = opts.haves.iter().map(|h| h.hex.clone()).collect();
if let Ok(digest) = pc.disk_cache().compute_pack_objects_key(
&repo,
&wants_hex,
&haves_hex,
opts.thin_pack,
opts.use_bitmaps,
opts.delta_base_offset,
) {
if let Some(file) = pc
.disk_cache()
.open_stream_read(crate::pack_cache::PACK_CACHE_NAMESPACE, &digest)
.ok()
.flatten()
{
tracing::info!(%repo, digest = %digest, "pack-objects cache hit, streaming from disk");
m.record("ok");
let (tx, rx) = tokio::sync::mpsc::channel(16);
tokio::spawn(async move {
let result = tokio::task::spawn_blocking(move || {
use std::io::Read;
let mut file = file;
let mut buf = vec![0u8; 65536];
let mut chunks = Vec::new();
loop {
match file.read(&mut buf) {
Ok(0) => break,
Ok(n) => chunks.push(Ok(PackfileChunk {
data: buf[..n].to_vec(),
})),
Err(e) => {
chunks.push(Err(tonic::Status::internal(format!(
"cache read error: {e}"
))));
break;
}
}
}
chunks
})
.await;
match result {
Ok(chunks) => {
for chunk in chunks {
if tx.send(chunk).await.is_err() {
break;
}
}
}
Err(e) => {
let _ = tx
.send(Err(tonic::Status::internal(format!(
"cache read task failed: {e}"
))))
.await;
}
}
});
return Ok(tonic::Response::new(ReceiverStream::new(rx)));
}
// Cache miss: execute pack-objects and tee to cache
tracing::info!(%repo, digest = %digest, "pack-objects cache miss");
let stream = gb.pack_objects(inner).await?;
let tee_stream = pc.tee_pack_stream(&digest, stream);
m.record("ok");
return Ok(tonic::Response::new(tee_stream));
}
}
let stream = gb.pack_objects(inner).await?;
tracing::info!(%repo, "pack-objects streaming started");
m.record("ok");
Ok(tonic::Response::new(stream))
}
@@ -192,11 +320,15 @@ impl pack_service_server::PackService for GitksService {
&self,
request: tonic::Request<tonic::Streaming<IndexPackRequest>>,
) -> Result<tonic::Response<IndexPackResponse>, tonic::Status> {
let m = crate::metrics::RequestMetrics::new("gitks.PackService/IndexPack");
let mut stream = request.into_inner();
let mut inputs = Vec::new();
while let Some(msg) = stream.next().await {
inputs.push(msg?);
}
let _rate = self
.acquire_rate_limit(inputs.first().and_then(|r: &IndexPackRequest| r.repository.as_ref()))
.await?;
let repo = self.repo_label(inputs.first().and_then(|r| r.repository.as_ref()));
let span = tracing::info_span!("pack.index_pack", %repo);
let _enter = span.enter();
@@ -210,14 +342,20 @@ impl pack_service_server::PackService for GitksService {
)
.await?
{
m.record("ok");
return client.index_pack(tokio_stream::iter(inputs)).await;
}
crate::metrics::record_rpc_error(&m, &err);
return Err(err);
}
Err(err) => {
crate::metrics::record_rpc_error(&m, &err);
return Err(err);
}
Err(err) => return Err(err),
};
let resp = gb.index_pack(inputs).map_err(into_status)?;
tracing::info!(%repo, objects = resp.object_count, "index_pack done");
m.record("ok");
Ok(tonic::Response::new(resp))
}
@@ -225,7 +363,9 @@ impl pack_service_server::PackService for GitksService {
&self,
request: tonic::Request<ListPackfilesRequest>,
) -> Result<tonic::Response<ListPackfilesResponse>, tonic::Status> {
let m = crate::metrics::RequestMetrics::new("gitks.PackService/ListPackfiles");
let inner = request.into_inner();
let _rate = self.acquire_rate_limit(inner.repository.as_ref()).await?;
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("pack.list_packfiles", %repo);
let _enter = span.enter();
@@ -235,14 +375,20 @@ impl pack_service_server::PackService for GitksService {
if let Some(mut client) =
remote_pack_client(self, inner.repository.as_ref(), false).await?
{
m.record("ok");
return client.list_packfiles(inner).await;
}
crate::metrics::record_rpc_error(&m, &err);
return Err(err);
}
Err(err) => {
crate::metrics::record_rpc_error(&m, &err);
return Err(err);
}
Err(err) => return Err(err),
};
let resp = gb.list_packfiles(inner).map_err(into_status)?;
tracing::info!(%repo, count = resp.packfiles.len(), "list_packfiles done");
m.record("ok");
Ok(tonic::Response::new(resp))
}
@@ -250,7 +396,9 @@ impl pack_service_server::PackService for GitksService {
&self,
request: tonic::Request<FsckRequest>,
) -> Result<tonic::Response<FsckResponse>, tonic::Status> {
let m = crate::metrics::RequestMetrics::new("gitks.PackService/Fsck");
let inner = request.into_inner();
let _rate = self.acquire_rate_limit(inner.repository.as_ref()).await?;
let repo = self.repo_label(inner.repository.as_ref());
let span = tracing::info_span!("pack.fsck", %repo);
let _enter = span.enter();
@@ -260,14 +408,20 @@ impl pack_service_server::PackService for GitksService {
if let Some(mut client) =
remote_pack_client(self, inner.repository.as_ref(), false).await?
{
m.record("ok");
return client.fsck(inner).await;
}
crate::metrics::record_rpc_error(&m, &err);
return Err(err);
}
Err(err) => {
crate::metrics::record_rpc_error(&m, &err);
return Err(err);
}
Err(err) => return Err(err),
};
let resp = gb.fsck(inner).map_err(into_status)?;
tracing::info!(%repo, ok = resp.ok, errors = resp.errors.len(), warnings = resp.warnings.len(), "fsck done");
m.record("ok");
Ok(tonic::Response::new(resp))
}
}