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

mwan3: close flock fd when starting mwan3.user scripts #24692

Merged
merged 1 commit into from
Oct 29, 2024

Conversation

feckert
Copy link
Member

@feckert feckert commented Jul 29, 2024

Maintainer: me
Compile tested: no
Run tested: no

Description:
Fixes deadlock with multiple init script calls.
Fixes openwrt/openwrt#15994

@BKPepe
Copy link
Member

BKPepe commented Oct 28, 2024

Anything new about this one? :)

Fixes deadlock with multiple init script calls

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
@feckert
Copy link
Member Author

feckert commented Oct 29, 2024

@BKPepe Thanks for the hint. This is only a workaround .
The entire locking in mwan3 must be changed! See the comments.
Unfortunately I don't have the time now to fix it correctly for the upcoming release. So I think we should use the workaround fix.

@feckert feckert merged commit 619629c into openwrt:master Oct 29, 2024
13 checks passed
@feckert feckert deleted the pr/20240729-mwan3 branch October 29, 2024 07:44
@BKPepe
Copy link
Member

BKPepe commented Oct 29, 2024

It is missing bump in PKG_RELEASE, in such cases, I miss autorelease variable, which we have in past. :-( Yeah, I looked at the issue in the main repo, and for me, it seems like, we need to backport this fix to the stable releases because no one will rewrite the entire mwan3 in the foreseeable future, though.

@feckert
Copy link
Member Author

feckert commented Oct 29, 2024

@BKPepe Done with commit 0532015

@BKPepe
Copy link
Member

BKPepe commented Oct 29, 2024

Great, thanks!

@feckert
Copy link
Member Author

feckert commented Oct 29, 2024

@BKPepe The question now is. Should I backport all changes between master and owrt-23.05?
Otherwise my version numbering will no longer fit and I'll get mixed up!

@BKPepe
Copy link
Member

BKPepe commented Oct 29, 2024

What? Why you would do that in the first place?

In the master branch, there is version 2.11.16 and in the OpenWrt 23.05 branch, there is 2.11.8.
You will increase there only PKG_RELEASE and backport this small workaround and you suggested to backport all those changes? Hmm, this is not how this should work. :-)

@BKPepe
Copy link
Member

BKPepe commented Oct 29, 2024

Backports are done in the standard approach how they should be: 18c3e8d (OpenWrt 23.05). That's why there is cherry pick and this method is done here multiple times while backporting smth to stable releases.

@feckert
Copy link
Member Author

feckert commented Oct 29, 2024

Ok thanks for my feedback. I would have seen it the same way. I was just unsure, so I wanted to ask again.

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.

mwan3 scripts deadlock on Asus TUF-AX4200
2 participants