Add raft-rs as a third package

Cargo.toml

@@ -16,6 +16,8 @@ members = [
 
     # third
     "third/raft-engine",
+    "third/raft-rs",
+    "third/raft-rs/proto",
 ]
 resolver = "2"
 
@@ -28,6 +30,7 @@ repository = "https://github.com/w41ter/sekas"
 
 [workspace.dependencies]
 async-stream = "0.3"
+bytes = "1"
 crc32fast = "1.3"
 derivative = "2.2"
 futures = "0.3"

Makefile

@@ -20,7 +20,10 @@ etcd:
 .PHONY: lint
 ## lint : Lint codespace
 lint:
-	$(V)cargo clippy --workspace --exclude raft-engine --tests --all-features -- -D warnings
+	$(V)cargo clippy --workspace --exclude raft-engine \
+		--exclude raft \
+		--exclude raft-proto \
+		--tests --all-features -- -D warnings
 
 .PHONY: fmt
 ## fmt : Format all code

src/server/Cargo.toml

@@ -51,10 +51,9 @@ tokio-util = { version = "0.7", features = ["time"] }
 url = "2.3"
 
 [dependencies.raft]
-git = "https://github.com/w41ter/raft-rs.git"
+path = "../../third/raft-rs"
 features = ["prost-codec", "default-logger"]
 default-features = false
-branch = "prost-0.11"
 
 [dependencies.raft-engine]
 path = "../../third/raft-engine"
@@ -77,7 +76,7 @@ layer_etcd = ["dep:sekas-etcd-proxy"]
 [dev-dependencies]
 ctor = "0.1"
 quote = "1.0"
-rand = { version = "0.8", features = ["small_rng"] }
+rand = { workspace = true, features = ["small_rng"] }
 reqwest = { version = "0.11", features = ["json"] }
 socket2 = "0.5"
 syn = "2.0"

third/raft-rs/CHANGELOG.md

@@ -0,0 +1,98 @@
+# 0.7.0 - 2023-03-06
+
+- Update prost to 0.11 (#496)
+- Make priority an i64 so a lower than default priority can be configured (#495)
+- Allow fetching entries in asynchronous manner (#459)
+- Support setting max-inflight-msgs in runtime to reduce memory usage (#450)
+
+# 0.6.0 - 2021-06-16
+
+- Joint Consensus became a stable feature (#379, #380, #382, #383, #385, #386, #411)
+- Ported aggresive flow control from etcd/raft (#354)
+- Introduced group commit to force geo replication safety (#359)
+- Harden read index (#355, #363)
+- Support limiting uncommitted logs (#398)
+- Support asynchronous ready (#403, #410, #417, #433)
+- Fast log append rejection (#367)
+- bytes::Bytes is used for protos if feature protobuf-codec is enabled (by default) (#438)
+- Switched to thiserror (#435)
+- Implemented committed entries pagination (#440)
+
+# 0.6.0-alpha - 2019-07-24
+
+- Protos now is a separate crate (https://github.com/pingcap/raft-rs/pull/247)
+- raft-rs is rust-2018 compatible (https://github.com/pingcap/raft-rs/pull/184)
+- Optional support for batch MsgAppend (https://github.com/pingcap/raft-rs/pull/179)
+- Harden follower read (https://github.com/pingcap/raft-rs/pull/220)
+- Migrate to slog (https://github.com/pingcap/raft-rs/pull/185)
+- Several code refactor and API clean up
+- Optional support for prost
+
+# 0.5.0 - 2019-02-11
+
+- Introduced an experimental Joint Consensus based arbitrary membership change feature. (https://github.com/pingcap/raft-rs/pull/101)
+- Harmonized `protobuf` dependency to match important downstreams. (https://github.com/pingcap/raft-rs/pull/181)
+- Unified the `Progress` collections inside `ProgressSet`. (https://github.com/pingcap/raft-rs/pull/108)
+- `Raft::new()` now returns a `Result`. (https://github.com/pingcap/raft-rs/pull/122)
+- Removed the `Progress.is_learner` field. Check via function in `ProgressSet` instead. (https://github.com/pingcap/raft-rs/pull/119)
+- Added Appvevor. Added then removed bors. (https://github.com/pingcap/raft-rs/pull/137, https://github.com/pingcap/raft-rs/pull/134)
+- Introduced getters and setters for various `Ready` fields. (https://github.com/pingcap/raft-rs/pull/120)
+- Reduced memory allocation on reset. (https://github.com/pingcap/raft-rs/pull/130)
+- Added issue templates, more links. (https://github.com/pingcap/raft-rs/pull/133, https://github.com/pingcap/raft-rs/pull/126)
+- Moved poll and quorum checking functionality into `ProgressSet`. (https://github.com/pingcap/raft-rs/pull/121)
+- The leader is now trivially in the replicate state. (https://github.com/pingcap/raft-rs/pull/146)
+- Fixed a problem with lease based read-only requests interacting with `check_quorum` wrong. (https://github.com/pingcap/raft-rs/pull/141)
+- Corrected the `single_mem_node` example. (https://github.com/pingcap/raft-rs/pull/162)
+- Fixed typos. (https://github.com/pingcap/raft-rs/pull/159)
+- Adopted [Hashbrown](https://github.com/Amanieu/hashbrown) over `FxHash`. (https://github.com/pingcap/raft-rs/pull/160)
+- Corrected learner checking in `handle_transfer_leader`. (https://github.com/pingcap/raft-rs/pull/165)
+- Resolved some lints (https://github.com/pingcap/raft-rs/pull/174, https://github.com/pingcap/raft-rs/pull/168, https://github.com/pingcap/raft-rs/pull/142, https://github.com/pingcap/raft-rs/pull/124)
+- Fixed uses of `#[feature(_)]` so that we can build on stable cleanly. (https://github.com/pingcap/raft-rs/pull/180)
+
+# 0.4.0 - 2018-09-18
+
+- No longer scan the raft log when becoming a leader. (https://github.com/pingcap/raft-rs/pull/100)
+- Added the ability to skip broadcast commit at runtime. (https://github.com/pingcap/raft-rs/pull/115)
+- Documented all public API. (https://github.com/pingcap/raft-rs/pull/87)
+- Refined a few points in the API in preparation for more work. (https://github.com/pingcap/raft-rs/pull/102)
+- Configuration logic was moved into its own module. (https://github.com/pingcap/raft-rs/pull/91)
+- Added [`fail-rs`](https://github.com/pingcap/fail-rs) based tests. (https://github.com/pingcap/raft-rs/pull/114)
+- Added benchmarking using [`criterion`](). (https://github.com/pingcap/raft-rs/pull/110)
+- Expanded tested examples. (https://github.com/pingcap/raft-rs/pull/118)
+- Improved documentation. (https://github.com/pingcap/raft-rs/pull/106)
+- Refined the CI scripts to ensure strict linting. (https://github.com/pingcap/raft-rs/pull/117)
+- Tests now output logs. Configure it with `RUST_LOG=raft=info`. (https://github.com/pingcap/raft-rs/pull/103)
+- Eased the `log` dependency. (https://github.com/pingcap/raft-rs/pull/116)
+- Formatting updates. (https://github.com/pingcap/raft-rs/pull/104)
+- Updated some dependencies. (https://github.com/pingcap/raft-rs/pull/97)
+- Use the clippy preview from Rustup. (https://github.com/pingcap/raft-rs/pull/95)
+- Adopted a Code of Conduct. (https://github.com/pingcap/raft-rs/pull/107)
+
+# 0.3.1 - 2018-07-10
+
+- Bugfix: Reset leader_id when becoming precandidate to resolve `prevote` and `check_quorum` compatability (https://github.com/pingcap/raft-rs/pull/84)
+- Bugfix: Becoming a precandidate should reset votes (https://github.com/pingcap/raft-rs/pull/83)
+- Fixed some typos, improve variable naming, and other small documentation fixes (https://github.com/pingcap/raft-rs/pull/77, https://github.com/pingcap/raft-rs/pull/79, https://github.com/pingcap/raft-rs/pull/78, https://github.com/pingcap/raft-rs/pull/80)
+- Implemented `Default` for `Config` and fleshed out an example (https://github.com/pingcap/raft-rs/pull/81)
+- Improved our changelog format (https://github.com/pingcap/raft-rs/pull/85)
+- Removed custom Rustfmt configuration (https://github.com/pingcap/raft-rs/pull/86)
+
+# 0.3.0 - 2018-06-07
+
+- Supported configuring the election timeout range (https://github.com/pingcap/raft-rs/pull/63).
+- Kept compatible with rust-protobuf 2.0 (https://github.com/pingcap/raft-rs/pull/64, https://github.com/pingcap/raft-rs/pull/75)
+- Made Raft now `Send` (https://github.com/pingcap/raft-rs/pull/67)
+- Added documentation examples (https://github.com/pingcap/raft-rs/pull/69)
+- Fixed a deadlock in the prevote migration process (https://github.com/pingcap/raft-rs/pull/42)
+
+# 0.2.0 - 2018-05-14
+
+- Deprecated sync-log and add context (https://github.com/pingcap/raft-rs/pull/59)
+- Fixed learner isolation bug (https://github.com/pingcap/raft-rs/pull/58)
+- Ported several tests (https://github.com/pingcap/raft-rs/pull/54, https://github.com/pingcap/raft-rs/pull/41)
+- Added examples (https://github.com/pingcap/raft-rs/pull/44)
+- Added fxhash (https://github.com/pingcap/raft-rs/pull/48)
+
+# 0.1.0 - 2018-02-26
+
+- initial release

third/raft-rs/Cargo.toml

@@ -0,0 +1,50 @@
+[package]
+name = "raft"
+version = "0.7.0"
+authors = ["The TiKV Project Developers"]
+license = "Apache-2.0"
+keywords = ["raft", "distributed-systems", "ha"]
+repository = "https://github.com/tikv/raft-rs"
+readme = "README.md"
+homepage = "https://github.com/tikv/raft-rs"
+documentation = "https://docs.rs/raft"
+description = "The rust language implementation of Raft algorithm."
+categories = ["algorithms", "database-implementations"]
+edition = "2021"
+
+[features]
+default = ["prost-codec", "default-logger"]
+# Enable failpoints
+failpoints = ["fail/failpoints"]
+protobuf-codec = ["raft-proto/protobuf-codec", "bytes"]
+prost-codec = ["raft-proto/prost-codec"]
+default-logger = ["slog-stdlog", "slog-envlogger", "slog-term"]
+
+# Make sure to synchronize updates with Harness.
+[dependencies]
+raft-proto = { path = "proto", version = "0.7.0", default-features = false }
+
+bytes = { workspace = true, optional = true }
+prost.workspace = true
+thiserror.workspace = true
+rand.workspace = true
+
+fxhash = "0.2.1"
+fail = { version = "0.4", optional = true }
+getset = "0.1.1"
+protobuf = "2"
+slog = "2.2"
+slog-envlogger = { version = "2.1.0", optional = true }
+slog-stdlog = { version = "4", optional = true }
+slog-term = { version = "2.4.0", optional = true }
+
+[dev-dependencies]
+criterion = "0.3"
+regex = "1"
+slog-async = "2.3.0"
+slog-envlogger = "2.1.0"
+slog-stdlog = "4"
+slog-term = "2.4.0"
+anyhow = "1.0.40"
+datadriven = { path = "datadriven", version = "0.1.0" }
+itertools = "0.10.0"