Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
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
138 changes: 2 additions & 136 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ homepage = "https://github.com/faiscadev/fila"
rust-version = "1.75"

[workspace.dependencies]
# gRPC + Protobuf (versions must match)
tonic = { version = "0.14", features = ["tls-ring"] }
tonic-prost = "0.14"
# Protobuf (used for Raft log entry serialization)
prost = "0.14"
prost-types = "0.14"
tonic-prost-build = "0.14"
prost-build = "0.14"

tokio = { version = "1", features = ["full"] }
serde = { version = "1", features = ["derive"] }
Expand All @@ -49,9 +47,6 @@ rcgen = "0.12"
sha2 = "0.10"

tokio-stream = "0.1"
tower = "0.5"
http = "1"
pin-project-lite = "0.2"

fila-proto = { path = "crates/fila-proto", version = "0.1.0" }
fila-core = { path = "crates/fila-core", version = "0.1.0" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ stories:
dependsOn: ["20.1", "20.2", "20.3"]
- id: "20.5"
title: "gRPC Removal & Final Benchmarks"
status: pending
status: completed
Copy link
Copy Markdown

@cubic-dev-ai cubic-dev-ai Bot Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P3: Keep the story status at review until the PR is merged so epic-review can set it to done.

(Based on your team's feedback about keeping story status as review while PRs are open.)

View Feedback

Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At _bmad-output/implementation-artifacts/epic-execution-state.yaml, line 35:

<comment>Keep the story status at `review` until the PR is merged so epic-review can set it to done.

(Based on your team's feedback about keeping story status as `review` while PRs are open.) </comment>

<file context>
@@ -32,9 +32,9 @@ stories:
   - id: "20.5"
     title: "gRPC Removal & Final Benchmarks"
-    status: pending
+    status: completed
     currentPhase: ""
-    branch: ""
</file context>
Suggested change
status: completed
status: review
Fix with Cubic

currentPhase: ""
branch: ""
branch: "feat/20.5-grpc-removal"
pr: null
dependsOn: ["20.1", "20.2", "20.3", "20.4"]
skippedIssues: []
2 changes: 1 addition & 1 deletion _bmad-output/implementation-artifacts/sprint-status.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ development_status:
20-2-admin-operations-auth-on-binary-protocol: done
20-3-rust-sdk-binary-protocol-client: done
20-4-cli-cluster-inter-node-migration: done
20-5-grpc-removal-final-benchmarks: backlog
20-5-grpc-removal-final-benchmarks: done
epic-20-retrospective: optional

# Epic 21: External SDK Migration
Expand Down
37 changes: 10 additions & 27 deletions crates/fila-bench/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ pub struct BenchServer {
child: Option<Child>,
/// Binary protocol address (host:port) for SDK connections.
addr: String,
/// gRPC address (http://host:port) for CLI commands.
grpc_addr: String,
_data_dir: tempfile::TempDir,
}

Expand All @@ -25,13 +23,8 @@ impl BenchServer {

/// Start a new fila-server instance with a specific DRR quantum.
pub fn start_with_quantum(quantum: Option<u32>) -> Self {
let grpc_port = free_port();
let mut binary_port = free_port();
while binary_port == grpc_port {
binary_port = free_port();
}
let grpc_addr = format!("127.0.0.1:{grpc_port}");
let binary_addr = format!("127.0.0.1:{binary_port}");
let port = free_port();
let addr = format!("127.0.0.1:{port}");
let data_dir = tempfile::tempdir().expect("create temp dir");

let scheduler_section = match quantum {
Expand All @@ -40,8 +33,7 @@ impl BenchServer {
};
let config_content = format!(
r#"[server]
listen_addr = "{grpc_addr}"
binary_addr = "{binary_addr}"
listen_addr = "{addr}"
{scheduler_section}
[telemetry]
otlp_endpoint = ""
Expand Down Expand Up @@ -78,31 +70,22 @@ otlp_endpoint = ""
}
});

// Poll TCP until both ports are reachable.
// Poll TCP until port is reachable.
let start = std::time::Instant::now();
let mut grpc_ok = false;
let mut binary_ok = false;
while start.elapsed() < Duration::from_secs(10) {
if !grpc_ok && std::net::TcpStream::connect(&grpc_addr).is_ok() {
grpc_ok = true;
}
if !binary_ok && std::net::TcpStream::connect(&binary_addr).is_ok() {
binary_ok = true;
}
if grpc_ok && binary_ok {
if std::net::TcpStream::connect(&addr).is_ok() {
break;
}
std::thread::sleep(Duration::from_millis(50));
}
assert!(
grpc_ok && binary_ok,
std::net::TcpStream::connect(&addr).is_ok(),
"fila-server did not become reachable within 10s"
);

Self {
child: Some(child),
addr: binary_addr,
grpc_addr: format!("http://{grpc_addr}"),
addr,
_data_dir: data_dir,
}
}
Expand All @@ -112,9 +95,9 @@ otlp_endpoint = ""
&self.addr
}

/// The gRPC address (http://host:port) for CLI commands.
pub fn grpc_addr(&self) -> &str {
&self.grpc_addr
/// The address for CLI commands (same as addr).
pub fn cli_addr(&self) -> &str {
&self.addr
}

/// The raw host:port address for the binary protocol.
Expand Down
Loading
Loading