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.

Sign up for GitHub

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

Jump to bottom

Fix jicofo_lock is null when restored from storage #13517

Merged
merged 2 commits into from
Jul 7, 2023
Merged

Fix jicofo_lock is null when restored from storage #13517

merged 2 commits into from
Jul 7, 2023

Conversation

hshim432
Copy link
Contributor

@hshim432 hshim432 commented Jul 3, 2023

https://prosody.im/doc/modules/mod_muc

Limit on number of rooms in-memory
Prosody keeps recently active rooms cached in memory for faster access. The size of this cache defaults to 100 rooms and can be configured like this:

muc_room_cache_size = 100 -- the default
When a room is pushed out of this cache by other more recently active rooms, its complete state is serialized to storage and removed from memory.

Public servers may want to monitor and possibly increase this setting if rooms are moved in and out of memory very often.

When room is serialized to storage, room.jicofo_lock is not saved.
https://github.com/bjc/prosody/blob/master/plugins/muc/muc.lib.lua#L1671-L1675

When the room is activated again, jicofo_lock is null and remains locked.

I fixed to save jicofo_lock.

saghul
saghul requested changes Jul 3, 2023
View reviewed changes
Copy link
Member

@saghul saghul left a comment

Choose a reason for hiding this comment

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

The change LGTM but there is an unrelated hunk, can you please undo that?

twa/app/src/main/res/xml/shortcuts.xml Outdated
@@ -1,16 +1 @@
<!--
Copy link
Member

Choose a reason for hiding this comment

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

Please undo this change.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@saghul
Please check again. Thank you.

@jitsi-jenkins
Copy link

Hi, thanks for your contribution!
If you haven't already done so, could you please make sure you sign our CLA (https://jitsi.org/icla for individuals and https://jitsi.org/ccla for corporations)? We would unfortunately be unable to merge your patch unless we have that piece :(.

@hshim432 hshim432 requested a review from saghul July 3, 2023 07:57
@damencho damencho added the info:cla-signed The CLA has been signed label Jul 7, 2023
@damencho
Copy link
Member

damencho commented Jul 7, 2023

Jenkins test this please.

@saghul
Copy link
Member

saghul commented Jul 7, 2023

I don't see how the test failure is related. @damencho does this LGTY?

@damencho damencho merged commit 5ce2bef into jitsi:master Jul 7, 2023
6 checks passed
hristoterezov pushed a commit that referenced this pull request Jul 19, 2023
@hshim432 @hristoterezov
fix: jicofo_lock is null when restored from storage (#13517)
9b907ed 
* Fix jicofo_lock is null when restored from storage

* revert

---------

Co-authored-by: hshim432 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saghul saghul saghul approved these changes

Assignees
No one assigned
Labels
info:cla-signed The CLA has been signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@hshim432 @jitsi-jenkins @damencho @saghul