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

Fix full-disk access check getting stuck #7326

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Conversation

dlon
Copy link
Member

@dlon dlon commented Dec 11, 2024

The full-disk access check can get stuck when there's no output from eslogger, and not timeout correctly. This was due to an incorrect else branch in tokio::select!.

Fix DES-1452.


This change is Reviewable

Copy link

linear bot commented Dec 11, 2024

@dlon dlon force-pushed the macos-fix-eslogger-timeout branch from baac372 to 24e0d74 Compare December 11, 2024 13:23
@dlon dlon requested a review from hulthe December 11, 2024 13:23
@dlon dlon added the Daemon Issues related to mullvad-daemon label Dec 11, 2024
@dlon dlon force-pushed the macos-fix-eslogger-timeout branch 2 times, most recently from 635637d to ca21b64 Compare December 12, 2024 10:45
Copy link
Contributor

@hulthe hulthe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed all commit messages.
Reviewable status: 0 of 1 files reviewed, 1 unresolved discussion (waiting on @dlon)


talpid-core/src/split_tunnel/macos/process.rs line 592 at r2 (raw file):

        let need_fda = parse_logger_status(
            async {
                //tokio::time::sleep(Duration::from_millis(1)).await;

:O

Copy link
Member Author

@dlon dlon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 1 files reviewed, 1 unresolved discussion (waiting on @hulthe)


talpid-core/src/split_tunnel/macos/process.rs line 592 at r2 (raw file):

Previously, hulthe (Joakim Hulthe) wrote…

:O

Done.

@dlon dlon force-pushed the macos-fix-eslogger-timeout branch from ca21b64 to e4ae24c Compare December 12, 2024 14:11
Copy link
Contributor

@hulthe hulthe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r3, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@dlon dlon merged commit 30fa5b8 into main Dec 12, 2024
49 of 50 checks passed
@dlon dlon deleted the macos-fix-eslogger-timeout branch December 12, 2024 14:14
dlon added a commit that referenced this pull request Dec 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Daemon Issues related to mullvad-daemon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants