Skip to content

Commit df6f424

Browse files
authored
Merge pull request #3386 from mulkieran/version-3.5.8
Version 3.5.8
2 parents 8ed94ea + 83d2af0 commit df6f424

File tree

33 files changed

+539
-457
lines changed

33 files changed

+539
-457
lines changed

.github/workflows/cargo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- uses: dtolnay/rust-toolchain@master
5252
with:
5353
components: cargo
54-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
54+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
5555
- name: Check out ci repo
5656
run: git clone https://github.com/stratis-storage/ci.git
5757
- name: Run comparisons of version specs with available Fedora packages

.github/workflows/fedora.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,33 +34,33 @@ jobs:
3434
matrix:
3535
include:
3636
- task: make -f Makefile clippy
37-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
37+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
3838
components: clippy
3939
- task: PROFILEDIR=debug make -f Makefile build
40-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
40+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
4141
components: cargo
4242
- task: PROFILEDIR=debug make -f Makefile build-min
43-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
43+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
4444
components: cargo
4545
- task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
46-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
46+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
4747
components: cargo
4848
- task: make -f Makefile docs-travis
49-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
49+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
5050
components: cargo
5151
- task: make -f Makefile test
52-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
52+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
5353
components: cargo
5454
- task: >-
5555
TANG_URL=localhost
5656
make -f Makefile test-clevis-loop-should-fail
57-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
57+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
5858
components: cargo
5959
- task: make -f Makefile build
60-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
60+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
6161
components: cargo
6262
- task: make -f Makefile build-min
63-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
63+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
6464
components: cargo
6565
runs-on: ubuntu-22.04
6666
container:
@@ -95,7 +95,7 @@ jobs:
9595
matrix:
9696
include:
9797
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop
98-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
98+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
9999
components: cargo
100100
runs-on: ubuntu-22.04
101101
container:

.github/workflows/main.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
matrix:
3535
include:
3636
- task: make -f Makefile fmt-travis
37-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
37+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
3838
components: rustfmt
3939
- task: make -f Makefile check-typos
40-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
40+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
4141
components: cargo
4242
runs-on: ubuntu-22.04
4343
container:
@@ -74,7 +74,7 @@ jobs:
7474
TANG_URL=tang
7575
RUST_LOG=stratisd=debug
7676
make -f Makefile test-clevis-loop
77-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
77+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
7878
components: cargo
7979
image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT
8080
runs-on: ubuntu-22.04
@@ -152,7 +152,7 @@ jobs:
152152
- uses: dtolnay/rust-toolchain@master
153153
with:
154154
components: cargo
155-
toolchain: 1.66.1 # LOWEST SUPPORTED RUST TOOLCHAIN
155+
toolchain: 1.69.0 # LOWEST SUPPORTED RUST TOOLCHAIN
156156
- name: Build stratisd
157157
run: PROFILEDIR=debug make -f Makefile build-all
158158
- name: Install stratisd
@@ -176,7 +176,7 @@ jobs:
176176
runs-on: ubuntu-22.04
177177
container:
178178
image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT
179-
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
179+
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
180180
steps:
181181
- uses: actions/checkout@v3
182182
- name: Install dependencies
@@ -208,7 +208,7 @@ jobs:
208208
- uses: dtolnay/rust-toolchain@master
209209
with:
210210
components: cargo
211-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
211+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
212212
- name: Run stratisd-min cli tests
213213
run: make test-stratisd-min
214214
- name: Run stratis-min cli tests
@@ -260,7 +260,7 @@ jobs:
260260
- uses: dtolnay/rust-toolchain@master
261261
with:
262262
components: cargo
263-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
263+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
264264
- name: Check out ci repo
265265
run: git clone https://github.com/stratis-storage/ci.git
266266
- name: Run ${{ matrix.task }}
@@ -295,7 +295,7 @@ jobs:
295295
- uses: dtolnay/rust-toolchain@master
296296
with:
297297
components: cargo
298-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
298+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
299299
- name: Build stratisd
300300
run: PROFILEDIR=debug make -f Makefile build-all
301301
- name: Install stratisd
@@ -339,7 +339,7 @@ jobs:
339339
- uses: dtolnay/rust-toolchain@master
340340
with:
341341
components: cargo
342-
toolchain: 1.66.1 # LOWEST SUPPORTED RUST TOOLCHAIN
342+
toolchain: 1.69.0 # LOWEST SUPPORTED RUST TOOLCHAIN
343343
- name: Build stratisd
344344
run: PROFILEDIR=debug make -f Makefile build-all
345345
- name: Install stratisd
@@ -353,7 +353,7 @@ jobs:
353353
- name: Use testing 3.5.2
354354
run: git checkout tags/v3.5.2 -b version-3.5.2
355355
working-directory: ./testing
356-
- name: Run stratisd_cert.py using Rust ${{ matrix.toolchain }}
356+
- name: Run stratisd_cert.py
357357
run: >
358358
sudo
359359
RUST_LOG=stratisd=debug

.github/workflows/python.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
matrix:
3434
include:
3535
# MANDATORY CHECKS USING CURRENT DEVELOPMENT ENVIRONMENT
36-
- toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
36+
- toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
3737
# MANDATORY CHECKS USING LOWEST SUPPORTED ENVIRONMENT PROXY
38-
- toolchain: 1.66.1 # LOWEST SUPPORTED RUST TOOLCHAIN
38+
- toolchain: 1.69.0 # LOWEST SUPPORTED RUST TOOLCHAIN
3939
runs-on: ubuntu-22.04
4040
steps:
4141
- uses: actions/checkout@v3
@@ -85,7 +85,7 @@ jobs:
8585
STRATIS_DUMPMETADATA=/usr/bin/stratis-dumpmetadata
8686
STRATISD=/usr/libexec/stratisd
8787
PYTHONPATH=./src
88-
udev-tests dump-metadata-tests
88+
udev-tests dump-metadata-tests startup-tests
8989
working-directory: ./tests/client-dbus
9090

9191
# PYTHON-BASED TESTS WITH TANG
@@ -134,7 +134,7 @@ jobs:
134134
- uses: dtolnay/rust-toolchain@master
135135
with:
136136
components: cargo
137-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
137+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
138138
- name: Build stratisd
139139
run: PROFILEDIR=debug make -f Makefile build-all
140140
- name: Install stratisd

.github/workflows/ubuntu.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,28 @@ jobs:
3434
matrix:
3535
include:
3636
- task: make -f Makefile clippy
37-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
37+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
3838
components: clippy
3939
- task: PROFILEDIR=debug make -f Makefile build
40-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
40+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
4141
components: cargo
4242
- task: PROFILEDIR=debug make -f Makefile build-min
43-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
43+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
4444
components: cargo
4545
- task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
46-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
46+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
4747
components: cargo
4848
- task: make -f Makefile docs-travis
49-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
49+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
5050
components: cargo
5151
- task: make -f Makefile test
52-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
52+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
5353
components: cargo
5454
- task: make -f Makefile build
55-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
55+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
5656
components: cargo
5757
- task: make -f Makefile build-min
58-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
58+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
5959
components: cargo
6060
runs-on: ubuntu-22.04
6161
container:
@@ -93,7 +93,7 @@ jobs:
9393
matrix:
9494
include:
9595
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop
96-
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
96+
toolchain: 1.71.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
9797
components: cargo
9898
runs-on: ubuntu-22.04
9999
container:

CHANGES.txt

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,46 @@
1+
stratisd 3.5.8
2+
==============
3+
Recommended Rust toolchain version: 1.71.0
4+
Lowest supported Rust toolchain version: 1.69.0
5+
6+
Recommended development platform for Python development: Fedora 38
7+
8+
- Run "cargo update"
9+
10+
- Cherry-picked commits:
11+
* Revert to returning an error if pool was partially stopped
12+
* Use stop_pool return value to decide StopAction
13+
* LiminalDevices::stop_pool() returns a bool
14+
* Add Partial to the constructors for StopActions
15+
* Add some comments to StopAction
16+
* Bug fix for liminal device code
17+
* README: update IRC network
18+
* github actions: update recommended Rust to 1.71.0
19+
* Remove dm::stop_partially_constructed_pool
20+
* Fix bug in partially unlocked pool setup
21+
* Increase itertools dependency lower bound to 0.11.0
22+
* Fix manual_next_back lint error
23+
* Start running startup test again, slightly modified
24+
* Remove tests target
25+
* Use enriched return value in test
26+
* Remove code for handling only pool size change
27+
* Send blockdev and pool change signal on grow physical
28+
* Do not send out signal on UserInfo change before r3
29+
* No longer ignore RUSTSEC-2021-0145 in audit target
30+
* Specify revision 0 blockdev interface for UserInfo signal
31+
* Specify blockdev interfaces for blockdev UserInfo
32+
* formatting
33+
* remove plymouth remnants
34+
* dracut: remove dependency on plymouth
35+
* Add comment to DM version check in setup_dm()
36+
* Increase devicemapper dependency lower bound to 0.33.5
37+
* Require udev support in container stratis-min-cli checks in GitHub Actions
38+
* Update lowest supported Rust to 1.69.0
39+
* Improve error message for unlock check
40+
* Do not use undefined matrix field "toolchain" in GitHub Action
41+
* Fix a source code typo in a test method
42+
43+
144
stratisd 3.5.7
245
==============
346
Recommended Rust toolchain version: 1.70.0

0 commit comments

Comments
 (0)