Skip to content

Commit

Permalink
Merge pull request #3590 from mulkieran/version-3.6.7
Browse files Browse the repository at this point in the history 
Version 3.6.7
  • Loading branch information
@mulkieran
mulkieran authored Apr 4, 2024
2 parents 02cf27b + c85286a commit 26e8e87
Show file tree
Hide file tree
Showing 11 changed files with 68 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cargo.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Check out ci repo
run: git clone https://github.com/stratis-storage/ci.git
- name: Run comparisons of version specs with available Fedora packages
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/fedora.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,45 +40,45 @@ jobs:
matrix:
include:
- task: make -f Makefile clippy
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: clippy
- task: PROFILEDIR=debug make -f Makefile build
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-min
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-min-no-systemd
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-utils
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-no-ipc
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile stratisd-tools
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile docs-ci
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile test
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: >-
TANG_URL=localhost
make -f Makefile test-clevis-loop-should-fail
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-min
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-no-ipc
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
matrix:
include:
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
matrix:
include:
- task: make -f Makefile fmt-ci
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: rustfmt
- task: make -f Makefile check-typos
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
TANG_URL=tang
RUST_LOG=stratisd=debug
make -f Makefile test-clevis-loop
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -217,7 +217,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Run stratisd-min cli tests
run: make test-stratisd-min
- name: Run stratis-min cli tests
Expand Down Expand Up @@ -267,7 +267,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Build stratisd
run: PROFILEDIR=debug make -f Makefile build-all
- name: Install stratisd
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/ubuntu.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,40 +40,40 @@ jobs:
matrix:
include:
- task: make -f Makefile clippy
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: clippy
- task: PROFILEDIR=debug make -f Makefile build
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-min
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-min-no-systemd
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-utils
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-no-ipc
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile stratisd-tools
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile docs-ci
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile test
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-min
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-no-ipc
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
matrix:
include:
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.77.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down
16 changes: 16 additions & 0 deletions CHANGES.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
stratisd 3.6.7
==============
Recommended Rust toolchain version: 1.77.0
Recommended development platform for Python development: Fedora 39

* New commits:
* Increase libc dependency lower bound to 0.2.153

* Cherry-picked commits:
* github actions: update recommended Rust to 1.77.0
* Add a debug entry for writing metadata to pool
* Allow two frequenty used abbreviations
* Create pipe so file descriptor is not dropped early
* Fix for /etc/fstab setup script


stratisd 3.6.6
==============
Recommended Rust toolchain version: 1.76.0
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock
View file

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

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "stratisd"
version = "3.6.6"
version = "3.6.7"
authors.workspace = true
edition.workspace = true
rust-version.workspace = true
Expand Down Expand Up @@ -138,7 +138,7 @@ version = "0.3.2"
optional = true

[dependencies.libc]
version = "0.2.147"
version = "0.2.153"
optional = true

[dependencies.libcryptsetup-rs]
Expand Down
8 changes: 8 additions & 0 deletions _typos.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ Strat = "Strat"
strat = "strat"
STRAT = "STRAT"

# Misidentified as misspelling of "ME"
MEK = "MEK"

[default.extend-identifiers]
# Misidentified as misspelling of "on"
pn = "pn"


[files]
# typos tries to correct the spelling of D-Bus signatures
extend-exclude = ["_introspect.py", "api.rs"]
5 changes: 5 additions & 0 deletions src/engine/strat_engine/backstore/blockdevmgr.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,11 @@ impl BlockDevMgr {
.iter_mut()
.filter(|b| b.max_metadata_size().bytes() >= data_size);

debug!(
"Writing {} of pool level metadata to devices in pool",
data_size
);

// TODO: consider making selection not entirely random, i.e, ensuring
// distribution of metadata over different paths.
let saved = candidates
Expand Down
4 changes: 2 additions & 2 deletions src/jsonrpc/client/pool.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ pub fn pool_start(
let password = prompt_password()?
.ok_or_else(|| StratisError::Msg("Password provided was empty".to_string()))?;

let (read_end, write_end) = pipe()?;
write(write_end, password.as_bytes())?;
do_request_standard!(PoolStart, id, unlock_method; {
let (read_end, write_end) = pipe()?;
write(write_end, password.as_bytes())?;
read_end.as_raw_fd()
})
} else {
Expand Down
2 changes: 1 addition & 1 deletion systemd/stratis-fstab-setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if $(stratis-min pool is-stopped "$POOL_UUID"); then
echo Failed to start pool with UUID $POOL_UUID using passphrase. >&2
fi
fi
if ! $(stratis-min pool is-encrypted); then
if ! $(stratis-min pool is-encrypted "$POOL_UUID"); then
if stratis-min pool start "$POOL_UUID"; then
exit 0
else
Expand Down

0 comments on commit 26e8e87

Please sign in to comment.