Merge pull request #3638 from mulkieran/version-3.6.8

Version 3.6.8
stratis-storage · Jul 2, 2024 · a4c7e7f · a4c7e7f
2 parents 26e8e87 + 212e2ff
commit a4c7e7f
Show file tree

Hide file tree

Showing 32 changed files with 511 additions and 348 deletions.
diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml
@@ -29,7 +29,7 @@ jobs:
   checks-with-ci-repo:
     runs-on: ubuntu-22.04
     container:
-      image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
+      image: fedora:40  # CURRENT DEVELOPMENT ENVIRONMENT
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies for Fedora
@@ -51,7 +51,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.79.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,49 +40,49 @@ jobs:
       matrix:
         include:
           - task: make -f Makefile clippy
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: clippy
           - task: PROFILEDIR=debug make -f Makefile build
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-min
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-min-no-systemd
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-utils
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-no-ipc
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile stratisd-tools
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile docs-ci
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile test
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: >-
               TANG_URL=localhost
               make -f Makefile test-clevis-loop-should-fail
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-min
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-no-ipc
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
-      image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
+      image: fedora:40  # CURRENT DEVELOPMENT ENVIRONMENT
       options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev
     steps:
       - uses: actions/checkout@v4
@@ -113,11 +113,11 @@ jobs:
       matrix:
         include:
           - task: RUST_LOG=stratisd=debug make -f Makefile test-loop
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
-      image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
+      image: fedora:40  # 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@v4

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ on:
       - 'CHANGES.txt'
       - '**/README.md'
       - 'README_tests.md'
-      - 'tests/**'
+      - 'tests/client-dbus/**'
       - '.packit.yaml'
       - 'plans/**'
       - 'tests-fmf/**'
@@ -21,7 +21,7 @@ on:
       - 'CHANGES.txt'
       - '**/README.md'
       - 'README_tests.md'
-      - 'tests/**'
+      - 'tests/client-dbus/**'
       - '.packit.yaml'
       - 'plans/**'
       - 'tests-fmf/**'
@@ -40,14 +40,14 @@ jobs:
       matrix:
         include:
           - task: make -f Makefile fmt-ci
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: rustfmt
           - task: make -f Makefile check-typos
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
-      image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
+      image: fedora:40  # CURRENT DEVELOPMENT ENVIRONMENT
       options: --privileged -v /dev:/dev
     steps:
       - uses: actions/checkout@v4
@@ -73,60 +73,6 @@ jobs:
       - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
         run: ${{ matrix.task }}
 
-  # TESTS WITH TANG
-  checks_with_tang:
-    strategy:
-      matrix:
-        include:
-          # MANDATORY CHECKS USING CURRENT DEVELOPMENT COMPILER
-          - task: >-
-              TANG_URL=tang
-              RUST_LOG=stratisd=debug
-              make -f Makefile test-clevis-loop
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-            components: cargo
-            image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
-    runs-on: ubuntu-22.04
-    container:
-      image: ${{ matrix.image }}
-      options: --privileged -v /dev:/dev -v /run/udev:/run/udev --ipc=host
-    services:
-      tang:
-        # yamllint disable rule:line-length
-        image: ghcr.io/stratis-storage/stratisd/tang:38
-        credentials:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-        options: --privileged -p 80:80
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install dependencies for Fedora
-        # cracklib-dicts: https://github.com/stratis-storage/project/issues/581
-        run: >
-          dnf install -y
-          clang
-          cryptsetup-devel
-          clevis
-          clevis-luks
-          cracklib-dicts
-          curl
-          dbus-devel
-          device-mapper-devel
-          device-mapper-persistent-data
-          libblkid-devel
-          make
-          ncurses
-          sudo
-          systemd-devel
-          systemd-udev
-          xfsprogs
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: ${{ matrix.components }}
-          toolchain: ${{ matrix.toolchain }}
-      - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
-        run: ${{ matrix.task }}
-
   stratis-cli-checks:
     runs-on: ubuntu-22.04
     container:
@@ -184,7 +130,7 @@ jobs:
   stratis-min-cli-checks:
     runs-on: ubuntu-22.04
     container:
-      image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
+      image: fedora:40  # 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@v4
@@ -217,7 +163,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
       - name: Run stratisd-min cli tests
         run: make test-stratisd-min
       - name: Run stratis-min cli tests
@@ -226,7 +172,7 @@ jobs:
   shell-checks:
     runs-on: ubuntu-22.04
     container:
-      image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
+      image: fedora:40  # CURRENT DEVELOPMENT ENVIRONMENT
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies
@@ -241,7 +187,7 @@ jobs:
   python-based-tests:
     runs-on: ubuntu-22.04
     container:
-      image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
+      image: fedora:40  # CURRENT DEVELOPMENT ENVIRONMENT
       options: --privileged -v /dev:/dev
     steps:
       - uses: actions/checkout@v4
@@ -267,7 +213,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
       - name: Build stratisd
         run: PROFILEDIR=debug make -f Makefile build-all
       - name: Install stratisd

diff --git a/.github/workflows/support.yml b/.github/workflows/support.yml
@@ -55,7 +55,7 @@ jobs:
             task: make -f Makefile yamllint tmtlint
             working-directory: .
     runs-on: ubuntu-22.04
-    container: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
+    container: fedora:40  # CURRENT DEVELOPMENT ENVIRONMENT
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -40,40 +40,40 @@ jobs:
       matrix:
         include:
           - task: make -f Makefile clippy
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: clippy
           - task: PROFILEDIR=debug make -f Makefile build
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-min
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-min-no-systemd
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-utils
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-no-ipc
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile stratisd-tools
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile docs-ci
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile test
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-min
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-no-ipc
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
@@ -111,7 +111,7 @@ jobs:
       matrix:
         include:
           - task: RUST_LOG=stratisd=debug make -f Makefile test-loop
-            toolchain: 1.77.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.79.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:

diff --git a/.gitignore b/.gitignore
@@ -45,3 +45,7 @@ stratisd_proc_macros/Cargo.lock
 
 # packit
 *.rpm
+
+# LLVM profiler trace data
+*.profraw
+*.profdata
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,45 @@
+stratisd 3.6.8
+==============
+Recommended Rust toolchain version: 1.79.0
+Recommended development platform for Python development: Fedora 40
+
+* New commits:
+  * Increase libc dependency lower bound to 0.2.155
+
+* Cherry-picked commits:
+  * Regression test for key set in stratis-min
+  * Add PROFILE_FLAGS to profileable targets
+  * github actions: ignore only pushes to tests/client-dbus dir
+  * github actions: update recommended Rust to 1.77.2
+  * Use once_cell instead of lazy_static for lazy statics
+  * Fix unnecessary-get-then-check with contains_key()
+  * Put timestamp management in a separate implementation
+  * Re-load the BDA after writing pool-level metadata
+  * Add stratis-min tests for missing subcommands
+  * test_fs_size_limit: Run fs_check after increasing limit
+  * github actions: update recommended Rust to 1.78.0
+  * Change deprecated use of default_features
+  * Advance current development environment to Fedora 40
+  * Revert "test_fs_size_limit: Run fs_check after increasing limit"
+  * test_fs_size_limit: Increase sizes by a factor of 2
+  * ci: Adjust Cockpit test plans
+  * Increase itertools dependency lower bound to 0.13.0
+  * Clarify conversion for set up pool to stopped pool
+  * Remove legacy std::u64::MAX constant
+  * Add test_stratis_min_pool_clevis_pin()
+  * Add stratis_min_key_set_empty()
+  * Add .gitignore entries for LLVM profiler traces
+  * Do software emulation of a TPM2 module
+  * github actions: update recommended Rust to 1.79.0
+  * Move to TMT with TPM2
+  * Increase nix dependency lower bound to 0.29.0
+  * Fix a typo in an error string
+  * Remove early exit
+  * Add a clarifying comment
+  * Change handle_extension to handle_fs_changes
+  * Merge invocation of should_extend and extend_size
+
+
 stratisd 3.6.7
 ==============
 Recommended Rust toolchain version: 1.77.0