Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revokefs: Use FUSE version 3 if possible #4326

Merged
merged 3 commits into from
Aug 16, 2022
Merged

Conversation

smcv
Copy link
Collaborator

@smcv smcv commented Jun 17, 2021

@nanonyme
Copy link
Contributor

Do we have some test suite that makes sure flatpak keeps building under both setups?

@smcv
Copy link
Collaborator Author

smcv commented Aug 24, 2021

Do we have some test suite that makes sure flatpak keeps building under both setups?

That's certainly something I should add before marking this as ready. (It is not ready.)

Actually testing the result on a real system with working FUSE, and checking that it works, is also a prerequisite for marking this MR as ready.

@smcv
Copy link
Collaborator Author

smcv commented Apr 30, 2022

This probably shouldn't be merged with "Use a libostree with ostreedev/ostree#2592 fixed" included, but I want to see whether that change fixes the CI.

A better way to avoid that bug would be to either wait for the fix to be merged in libostree, or add a suppression.

@smcv smcv force-pushed the fuse3 branch 2 times, most recently from 4c89b8b to 9c4a6a2 Compare April 30, 2022 16:06
@smcv
Copy link
Collaborator Author

smcv commented Apr 30, 2022

Actually testing the result on a real system with working FUSE, and checking that it works, is also a prerequisite for marking this MR as ready.

Flatpak's test-suite passes on Debian unstable (locally) and Ubuntu 18.04 (on CI) with FUSE 2, and on Debian unstable (locally) and Ubuntu 20.04 (on CI) with FUSE 3.

This probably shouldn't be merged with "Use a libostree with ostreedev/ostree#2592 fixed" included, but I want to see whether that change fixes the CI.

That change did fix the CI. I've now replaced it with a valgrind suppression, which will hopefully also fix the CI.

@smcv smcv marked this pull request as ready for review April 30, 2022 16:10
@smcv
Copy link
Collaborator Author

smcv commented May 1, 2022

I've now replaced it with a valgrind suppression, which will hopefully also fix the CI

(It did)

@smcv smcv requested review from alexlarsson and mwleeds May 1, 2022 09:48
@mwleeds mwleeds modified the milestones: 1.14.0, 1.16.0 Jul 23, 2022
@mwleeds
Copy link
Collaborator

mwleeds commented Jul 23, 2022

Adding this to the 1.16.0 milestone since it otherwise may not get enough testing if it's released in 1.14.0, based on discussion in the BoF session. Feel free to disagree Simon

@smcv
Copy link
Collaborator Author

smcv commented Aug 9, 2022

Adding this to the 1.16.0 milestone since it otherwise may not get enough testing if it's released in 1.14.0

How soon is 1.14.0 planned to happen, and how much testing do we expect to need for this? Distributions seem quite keen to move on from FUSE 2 to FUSE 3.

@alexlarsson
Copy link
Member

Honestly, i think we should just merge this. Its up to distros that want to switch to fuse3 to test it, and the code looks sane to me (and doesn't really change a lot).

@smcv can you resolve the conflicts?

smcv and others added 3 commits August 16, 2022 11:46
Based on a change contributed by Léo Stefanesco; but instead of
unconditionally using FUSE 3, leave a fallback code path for FUSE 2 for
older distros.

Co-authored-by: Léo Stefanesco <leo.lveb@gmail.com>
Signed-off-by: Simon McVittie <smcv@collabora.com>
This is fixed in v2022.3, but that version missed the boat for Ubuntu
22.04.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This ensures we exercise both code paths.

Signed-off-by: Simon McVittie <smcv@collabora.com>
@smcv
Copy link
Collaborator Author

smcv commented Aug 16, 2022

can you resolve the conflicts?

Done. Now that we have an Ubuntu 22.04 CI pass, I used that as the one that targets fuse3, while keeping 20.04 and 18.04 on fuse 2.

@alexlarsson alexlarsson merged commit 061102d into flatpak:main Aug 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants