refactor(server): make process wiring explicit (#1243) - #1456
Merged
Conversation
Declare server-side metadata and storage adapters directly and use direct process crate imports for master, worker, and transfer startup.
Contributor
There was a problem hiding this comment.
Pull request overview
Refactors curvine-server to wire server-side process crates and adapters explicitly (master/worker/transfer, metadata, local storage) while keeping the existing binary entrypoint and service selection behavior unchanged.
Changes:
- Added explicit
curvine-raft,curvine-rocksdb, andcurvine-storage-localdependencies tocurvine-server, and forwarded SPDK/RDMA-related features to the local storage adapter. - Updated the server binary to import
Master,Worker, andTransferServerdirectly from their respective process crates. - Updated server tests and internal test utilities to reference raft/journal types via
curvine-raftinstead ofcurvine-commoncompatibility paths.
Reviewed changes
Copilot reviewed 10 out of 11 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| curvine-server/Cargo.toml | Adds explicit workspace deps (raft/rocksdb/storage-local) and forwards SPDK/RDMA features to the local storage adapter. |
| curvine-server/src/bin/curvine-server.rs | Switches binary wiring to import Master/Worker/TransferServer directly from their process crates. |
| curvine-server/src/lib.rs | Adds explicit public wiring re-exports for metadata (raft/rocksdb), storage (local), and data transfer. |
| curvine-server/src/test/mini_cluster.rs | Updates raft peer imports to come from curvine-raft. |
| curvine-server/tests/journal_test.rs | Moves raft proto/storage imports from curvine-common compatibility facade to curvine-raft. |
| curvine-server/tests/load_job_submit_test.rs | Uses curvine_raft::conf::JournalConf directly. |
| curvine-server/tests/lock_order_deadlock_stress_test.rs | Uses curvine_raft::conf::JournalConf directly. |
| curvine-server/tests/master_fs_test.rs | Uses curvine_raft::conf::JournalConf and raft storage types directly. |
| curvine-server/tests/resize_lock_p95_test.rs | Uses curvine_raft::conf::JournalConf directly. |
| curvine-server/tests/resize_lock_scope_test.rs | Uses curvine_raft::conf::JournalConf directly. |
| Cargo.lock | Updates the curvine-server package dependency list to include the new direct deps. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
jlon
approved these changes
Aug 2, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Make
curvine-serverwire the process crates and server-side adapters explicitly while keeping the existing binary entry and service selection behavior unchanged.Issue Describe / Design
Related to #1243
This is a wiring-only refactor. The server binary now imports the master, worker, and transfer process crates directly, and the server crate declares/re-exports the metadata and local storage adapter crates it assembles. Existing compatibility re-exports from
curvine-commonare intentionally left for the later facade cleanup so this PR stays small and reviewable.Changes
curvine-server/Cargo.tomlcurvine-raft,curvine-rocksdb, andcurvine-storage-localdependencies; mapped SPDK/RDMA features through the local storage adapter.curvine-server/src/bin/curvine-server.rsMaster,Worker, andTransferServerdirectly from their process crates.curvine-server/src/lib.rscurvine-server/src/testandcurvine-server/testscurvine-raftinstead of thecurvine-commoncompatibility facade.Test verified
cargo check -p curvine-server --all-targetsCargo.lockafter adding direct workspace deps.make formatcargo check -p curvine-server --all-targets --lockedcargo tree -p curvine-server --depth 1curvine-master,curvine-worker,curvine-data-transfer,curvine-raft,curvine-rocksdb, andcurvine-storage-localdependencies.rg "curvine-client|curvine_client::|curvine_client\b" curvine-server/Cargo.toml curvine-server/src curvine-server/testscurvine-client-coreremains; no publiccurvine-clientfacade dependency or import.rg "curvine_common::(raft|rocksdb)|curvine_common::proto::raft|curvine_common::conf::JournalConf" curvine-server/src curvine-server/testsgit diff --checkDependencies