Skip to content

Commit

Permalink
Merge branch 'master' into add_write_compression_ratio
Browse files Browse the repository at this point in the history
Signed-off-by: lucasliang <nkcs_lykx@hotmail.com>
  • Loading branch information
LykxSassinator committed Apr 23, 2024
2 parents 74cd975 + 084c5ca commit 9bf4f64
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 28 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2024-02-10
toolchain: nightly-2023-12-31
override: true
components: rustfmt, clippy, rust-src
- uses: Swatinem/rust-cache@v1
Expand All @@ -33,7 +33,7 @@ jobs:
make format
git diff --exit-code
- name: Clippy
run: ulimit -S -n `ulimit -H -n` && make clippy
run: make clippy
env:
EXTRA_CARGO_ARGS: '--fix'
- name: Run tests
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.76.0
toolchain: 1.75.0
override: true
components: rustfmt, clippy, rust-src
- uses: Swatinem/rust-cache@v1
Expand All @@ -89,7 +89,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2024-02-10
toolchain: nightly-2023-12-31
override: true
components: llvm-tools-preview
- uses: Swatinem/rust-cache@v1
Expand All @@ -107,6 +107,8 @@ jobs:
- name: Run grcov
run: grcov `find . \( -name "*.profraw" \) -print` --binary-path target/debug/deps/ -s . -t lcov --branch --ignore-not-existing --ignore '../**' --ignore '/*' -o coverage.lcov
- name: Upload
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v3
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
file: coverage.lcov
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,17 @@

## [Unreleased]

## New Features
### New Features

* Add a new Prometheus metric `raft_engine_write_compression_ratio` to track compression ratio of write #358

## [0.4.2] - 2024-04-16

### Behavior Changes

* Periodically flush unsynced bytes when rewriting to avoid I/O jitters if flushing too many bytes impede the foreground writes. (#347)
* Errors will be returned if rewriting fails, instread of `panic` directly. (#343)

## [0.4.1] - 2023-09-14

### Behavior Changes
Expand Down
34 changes: 16 additions & 18 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "raft-engine"
version = "0.4.1"
version = "0.4.2"
authors = ["The TiKV Project Developers"]
edition = "2018"
rust-version = "1.76.0"
rust-version = "1.75.0"
description = "A persistent storage engine for Multi-Raft logs"
readme = "README.md"
repository = "https://github.com/tikv/raft-engine"
Expand Down Expand Up @@ -42,7 +42,10 @@ hex = "0.4"
if_chain = "1.0"
lazy_static = "1.3"
libc = "0.2"
log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }
log = { version = "0.4", features = [
"max_level_trace",
"release_max_level_debug",
] }
lz4-sys = "1.9"
memmap2 = { version = "0.9", optional = true }
nix = "0.26"
Expand All @@ -64,8 +67,12 @@ thiserror = "1.0"
criterion = "0.4"
ctor = "0.2"
env_logger = "0.10"
kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = false, features = ["protobuf-codec"] }
raft = { git = "https://github.com/tikv/raft-rs", branch = "master", default-features = false, features = ["protobuf-codec"] }
kvproto = { git = "https://github.com/pingcap/kvproto.git", default-features = false, features = [
"protobuf-codec",
] }
raft = { git = "https://github.com/tikv/raft-rs", branch = "master", default-features = false, features = [
"protobuf-codec",
] }
rand = "0.8"
rand_distr = "0.4"
tempfile = "3.6"
Expand All @@ -74,19 +81,10 @@ toml = "0.8"
[features]
default = ["internals", "scripting"]
internals = []
nightly = [
"prometheus/nightly",
]
failpoints = [
"fail/failpoints",
]
scripting = [
"rhai",
]
swap = [
"nightly",
"memmap2",
]
nightly = ["prometheus/nightly"]
failpoints = ["fail/failpoints"]
scripting = ["rhai"]
swap = ["nightly", "memmap2"]
std_fs = []

nightly_group = ["nightly", "swap"]
Expand Down
9 changes: 6 additions & 3 deletions ctl/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
[package]
name = "raft-engine-ctl"
version = "0.4.1"
version = "0.4.2"
authors = ["The TiKV Project Developers"]
edition = "2018"
rust-version = "1.76.0"
rust-version = "1.75.0"
description = "A control tool for Raft Engine"
repository = "https://github.com/tikv/raft-engine"
license = "Apache-2.0"

[dependencies]
clap = { version = "3.1", features = ["derive", "cargo"] }
env_logger = "0.10"
raft-engine = { path = "..", version = "0.4.1", features = ["scripting", "internals"] }
raft-engine = { path = "..", version = "0.4.1", features = [
"scripting",
"internals",
] }
2 changes: 1 addition & 1 deletion stress/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "stress"
version = "0.4.1"
version = "0.4.2"
authors = ["The TiKV Authors"]
edition = "2018"

Expand Down

0 comments on commit 9bf4f64

Please sign in to comment.