Merge pull request #3535 from mulkieran/version-3.6.4

Version 3.6.4
stratis-storage · Jan 24, 2024 · af61a86 · af61a86
2 parents ae54933 + 3f70c64
commit af61a86
Show file tree

Hide file tree

Showing 36 changed files with 400 additions and 253 deletions.
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
@@ -4,7 +4,7 @@ export PROFILEDIR=debug
 
 make fmt-ci &&
 	make build &&
-	make stratis-dumpmetadata &&
+	make stratisd-tools &&
 	make build-min &&
 	make build-no-ipc &&
 	make test &&

diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml
@@ -31,7 +31,7 @@ jobs:
     container:
       image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install dependencies for Fedora
         run: >
           dnf install -y
@@ -51,12 +51,12 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.75.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
         # yamllint disable rule:line-length
         run: |
           COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions
+          COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f39 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions
           COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f38 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions
-          COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f37 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions
diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
@@ -40,46 +40,46 @@ jobs:
       matrix:
         include:
           - task: make -f Makefile clippy
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: clippy
           - task: PROFILEDIR=debug make -f Makefile build
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-min
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-no-ipc
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
-          - task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          - task: PROFILEDIR=debug make -f Makefile stratisd-tools
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile docs-ci
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile test
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: >-
               TANG_URL=localhost
               make -f Makefile test-clevis-loop-should-fail
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-min
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-no-ipc
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
       image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
       options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install dependencies for Fedora
         run: >
           dnf install -y
@@ -107,14 +107,14 @@ jobs:
       matrix:
         include:
           - task: RUST_LOG=stratisd=debug make -f Makefile test-loop
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
       image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
       options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev --ipc=host
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install dependencies for Fedora
         run: >
           dnf install -y

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -40,17 +40,17 @@ jobs:
       matrix:
         include:
           - task: make -f Makefile fmt-ci
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: rustfmt
           - task: make -f Makefile check-typos
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
       image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
       options: --privileged -v /dev:/dev
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install dependencies for Fedora
         run: >
           dnf install -y
@@ -83,7 +83,7 @@ jobs:
               TANG_URL=tang
               RUST_LOG=stratisd=debug
               make -f Makefile test-clevis-loop
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
             image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
     runs-on: ubuntu-22.04
@@ -99,7 +99,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
         options: --privileged -p 80:80
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install dependencies for Fedora
         # cracklib-dicts: https://github.com/stratis-storage/project/issues/581
         run: >
@@ -133,7 +133,7 @@ jobs:
       image: fedora:34  # LOWEST DEVELOPMENT ENVIRONMENT
       options: --privileged --userns=host --ipc=host -v /run/dbus/system_bus_socket:/run/dbus/system_bus_socket:ro -v /usr/share/dbus-1:/usr/share/dbus-1
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install dependencies
         run: >
           dnf install -y
@@ -187,7 +187,7 @@ jobs:
       image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
       options: --privileged --userns=host --ipc=host -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev -v /run/dbus/system_bus_socket:/run/dbus/system_bus_socket:ro -v /usr/share/dbus-1:/usr/share/dbus-1
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install dependencies
         run: >
           dnf install -y
@@ -217,7 +217,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
       - name: Run stratisd-min cli tests
         run: make test-stratisd-min
       - name: Run stratis-min cli tests
@@ -228,7 +228,7 @@ jobs:
     container:
       image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install dependencies
         run: >
           dnf install -y
@@ -244,7 +244,7 @@ jobs:
       image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
       options: --privileged -v /dev:/dev
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install dependencies for Fedora
         run: >
           dnf install -y
@@ -267,7 +267,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
       - name: Build stratisd
         run: PROFILEDIR=debug make -f Makefile build-all
       - name: Install stratisd
@@ -287,7 +287,7 @@ jobs:
             args: --log-level=debug stratisd_cert --verify-devices --monitor-dbus --highest-revision-number=6
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run apt-get update
         run: sudo apt-get -q update
       - name: Install dependencies

diff --git a/.github/workflows/support.yml b/.github/workflows/support.yml
@@ -57,7 +57,7 @@ jobs:
     runs-on: ubuntu-22.04
     container: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install dependencies
         run: >
           dnf install -y

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -40,41 +40,41 @@ jobs:
       matrix:
         include:
           - task: make -f Makefile clippy
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: clippy
           - task: PROFILEDIR=debug make -f Makefile build
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-min
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-no-ipc
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
-          - task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          - task: PROFILEDIR=debug make -f Makefile stratisd-tools
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile docs-ci
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile test
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-min
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-no-ipc
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
       image: ubuntu:jammy
       options: --privileged -v /dev:/dev
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install dependencies for Ubuntu
         run: apt-get -q update
       - name: Install dependencies for Ubuntu
@@ -105,14 +105,14 @@ jobs:
       matrix:
         include:
           - task: RUST_LOG=stratisd=debug make -f Makefile test-loop
-            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
       image: ubuntu:jammy
       options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev --ipc=host
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install dependencies for Ubuntu
         run: apt-get -q update
       - name: Install dependencies for Ubuntu

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,36 @@
+stratisd 3.6.4
+==============
+Recommended Rust toolchain version: 1.75.0
+Recommended development platform for Python development: Fedora 39
+
+- Cherry-picked commits:
+  * Update to nix 0.27.1
+  * github actions: update FEDORA_RELEASE to F39, F38
+  * Parameterize /usr/libexec everywhere
+  * github actions: update recommended Rust to 1.74.1
+  * Increase itertools dependency lower bound to 0.12.0
+  * Replace get(0) with first()
+  * Remove unused imports
+  * Move initialize_devices import to cfg(test)
+  * should_wake: replace get(0) with front()
+  * github actions: update recommended Rust to 1.75.0
+  * Fix up prediction tests to match new filesystem interface
+  * Start running clippy on stratis-dumpmetadata
+  * Remove unwrap() in stratis-dumpmetadata
+  * Run thin_check in loud mode
+  * Do not pass -q option to xfs.mkfs
+  * Try both Clevis and passphrase in /etc/fstab setup
+  * Put dump-metadata code in separate file
+  * Improve dispatch for tools in tools package
+  * Use loopdev-3 instead of loopdev crate
+  * Use checkout@v4
+  * Fix bug where unencrypted pools can't be started in stratisd-min
+  * Increase shlex version in Cargo.lock to 1.3.0
+  * Fix for githooks
+  * Increase pretty-hex dependency lower bound to 0.4.1
+  * Makefile_dependencies: fix verify-dependency-bounds target
+
+
 stratisd 3.6.3
 ==============
 Recommended Rust toolchain version: 1.74.0