Merge pull request #3551 from mulkieran/version-3.6.5

Version 3.6.5
stratis-storage · Feb 13, 2024 · 80705ec · 80705ec
2 parents af61a86 + d084685
commit 80705ec
Show file tree

Hide file tree

Showing 22 changed files with 698 additions and 522 deletions.
diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.76.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

diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
@@ -40,39 +40,45 @@ jobs:
       matrix:
         include:
           - task: make -f Makefile clippy
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: clippy
           - task: PROFILEDIR=debug make -f Makefile build
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-min
+            toolchain: 1.76.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
             components: cargo
-          - task: PROFILEDIR=debug make -f Makefile build-no-ipc
+          - task: PROFILEDIR=debug make -f Makefile build-utils
             toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
+          - task: PROFILEDIR=debug make -f Makefile build-no-ipc
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            components: cargo
           - task: PROFILEDIR=debug make -f Makefile stratisd-tools
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile docs-ci
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile test
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: >-
               TANG_URL=localhost
               make -f Makefile test-clevis-loop-should-fail
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-min
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-no-ipc
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
@@ -107,7 +113,7 @@ jobs:
       matrix:
         include:
           - task: RUST_LOG=stratisd=debug make -f Makefile test-loop
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -40,10 +40,10 @@ jobs:
       matrix:
         include:
           - task: make -f Makefile fmt-ci
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: rustfmt
           - task: make -f Makefile check-typos
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
@@ -83,7 +83,7 @@ jobs:
               TANG_URL=tang
               RUST_LOG=stratisd=debug
               make -f Makefile test-clevis-loop
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
             image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
     runs-on: ubuntu-22.04
@@ -217,7 +217,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
       - name: Run stratisd-min cli tests
         run: make test-stratisd-min
       - name: Run stratis-min cli tests
@@ -267,7 +267,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
       - name: Build stratisd
         run: PROFILEDIR=debug make -f Makefile build-all
       - name: Install stratisd

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -40,34 +40,40 @@ jobs:
       matrix:
         include:
           - task: make -f Makefile clippy
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: clippy
           - task: PROFILEDIR=debug make -f Makefile build
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-min
+            toolchain: 1.76.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
             components: cargo
-          - task: PROFILEDIR=debug make -f Makefile build-no-ipc
+          - task: PROFILEDIR=debug make -f Makefile build-utils
             toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
+          - task: PROFILEDIR=debug make -f Makefile build-no-ipc
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            components: cargo
           - task: PROFILEDIR=debug make -f Makefile stratisd-tools
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile docs-ci
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile test
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-min
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-no-ipc
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
@@ -105,7 +111,7 @@ jobs:
       matrix:
         include:
           - task: RUST_LOG=stratisd=debug make -f Makefile test-loop
-            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.76.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,26 @@
+stratisd 3.6.5
+==============
+Recommended Rust toolchain version: 1.76.0
+Recommended development platform for Python development: Fedora 39
+
+* Cherry-picked commits:
+  * Improve readability of locking code
+  * Change comment
+  * Relax fairness restriction on AllOrSomeLock
+  * Fix log message in SetCreateAction
+  * Remove redundant remove_stratis_dm_devices()
+  * Remove remove_stratis_dm_devices entirely
+  * Set timeout of 30 sec after interrupt signal sent
+  * Kill stratisd process if a terminate has not worked
+  * Add some Python logging in test infrastructure
+  * Make dump_metadata module private
+  * create_pool(): reformat for black 24.1.1
+  * github actions: update recommended Rust to 1.76.0
+  * Refactor stratis-utils for better modularity and more convenient dispatch
+  * Build min targets without systemd enabled
+  * Build the -utils binary separately
+
+
 stratisd 3.6.4
 ==============
 Recommended Rust toolchain version: 1.75.0

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stratisd"
-version = "3.6.4"
+version = "3.6.5"
 authors = ["Stratis Developers <[email protected]>"]
 edition = "2021"
 rust-version = "1.71.1"  # LOWEST SUPPORTED RUST TOOLCHAIN

diff --git a/Makefile b/Makefile
@@ -47,6 +47,7 @@ NO_IPC_FEATURES = --no-default-features --features engine
 SYSTEMD_FEATURES = --no-default-features --features engine,min,systemd_compat
 EXTRAS_FEATURES =  --no-default-features --features engine,extras,min
 UDEV_FEATURES = --no-default-features --features udev_scripts
+UTILS_FEATURES = --no-default-features --features engine,systemd_compat
 
 DENY = -D warnings -D future-incompatible -D unused -D rust_2018_idioms -D nonstandard_style
 
@@ -209,14 +210,37 @@ build-tests:
 	RUSTFLAGS="${DENY}" \
 	cargo test --no-run ${RELEASE_FLAG} ${TARGET_ARGS}
 
+## Build stratis-utils only
+build-utils:
+	PKG_CONFIG_ALLOW_CROSS=1 \
+	RUSTFLAGS="${DENY}" \
+	cargo ${BUILD} ${RELEASE_FLAG} \
+	--bin=stratis-utils \
+	${UTILS_FEATURES} ${TARGET_ARGS}
+
+build-utils-no-systemd:
+	PKG_CONFIG_ALLOW_CROSS=1 \
+	RUSTFLAGS="${DENY}" \
+	cargo ${BUILD} ${RELEASE_FLAG} \
+	--bin=stratis-utils \
+	${NO_IPC_FEATURES} ${TARGET_ARGS}
+
 ## Build stratisd-min and stratis-min for early userspace
 build-min:
 	PKG_CONFIG_ALLOW_CROSS=1 \
 	RUSTFLAGS="${DENY}" \
 	cargo ${BUILD} ${RELEASE_FLAG} \
-	--bin=stratis-min --bin=stratisd-min --bin=stratis-utils \
+	--bin=stratis-min --bin=stratisd-min \
 	${SYSTEMD_FEATURES} ${TARGET_ARGS}
 
+## Build min targets without systemd support enabled
+build-min-no-systemd:
+	PKG_CONFIG_ALLOW_CROSS=1 \
+	RUSTFLAGS="${DENY}" \
+	cargo ${BUILD} ${RELEASE_FLAG} \
+	--bin=stratis-min --bin=stratisd-min \
+	${MIN_FEATURES} ${TARGET_ARGS}
+
 ## Build stratisd-min and stratis-min for early userspace
 build-no-ipc:
 	PKG_CONFIG_ALLOW_CROSS=1 \
@@ -344,7 +368,7 @@ install-daemons:
 install: install-udev-cfg install-man-cfg install-dbus-cfg install-dracut-cfg install-systemd-cfg install-binaries install-udev-binaries install-fstab-script install-daemons
 
 ## Build all Rust artifacts
-build-all-rust: build build-min build-udev-utils stratisd-tools
+build-all-rust: build build-min build-utils build-udev-utils stratisd-tools
 
 ## Build all man pages
 build-all-man: docs/stratisd.8 docs/stratis-dumpmetadata.8
@@ -468,12 +492,16 @@ clippy-min:
 clippy-udev-utils:
 	RUSTFLAGS="${DENY}" cargo clippy ${CLIPPY_OPTS} ${UDEV_FEATURES} -- ${CLIPPY_DENY} ${CLIPPY_PEDANTIC} ${CLIPPY_PEDANTIC_USELESS}
 
+## Run clippy on the utils binary
+clippy-utils:
+	RUSTFLAGS="${DENY}" cargo clippy ${CLIPPY_OPTS} ${UTILS_FEATURES} -- ${CLIPPY_DENY} ${CLIPPY_PEDANTIC} ${CLIPPY_PEDANTIC_USELESS}
+
 ## Run clippy on no-ipc-build
 clippy-no-ipc:
 	RUSTFLAGS="${DENY}" cargo clippy ${CLIPPY_OPTS} ${NO_IPC_FEATURES} -- ${CLIPPY_DENY} ${CLIPPY_PEDANTIC} ${CLIPPY_PEDANTIC_USELESS}
 
 ## Run clippy on the current source tree
-clippy: clippy-macros clippy-min clippy-udev-utils clippy-no-ipc
+clippy: clippy-macros clippy-min clippy-udev-utils clippy-no-ipc clippy-utils
 	RUSTFLAGS="${DENY}" cargo clippy ${CLIPPY_OPTS} -- ${CLIPPY_DENY} ${CLIPPY_PEDANTIC} ${CLIPPY_PEDANTIC_USELESS}
 
 .PHONY: