fix: add job-level lock to prevent redundant cross-instance reads in …fix: Add job-level lock to prevent redundant cross-instance reads in Presence service by ZunedKhan07 · Pull Request #40987 · RocketChat/Rocket.Chat

ZunedKhan07 · 2026-06-17T13:01:13Z

Summary

In Microservices (MS) mode, every instance of the presence service was independently executing the removeLostConnections operation inside the started() lifecycle timeout loop. This caused redundant cross-instance reads and unnecessary heavy database/broker operations across multiple running instances.

Changes

Wrapped the removeLostConnections lifecycle timeout logic inside a distributed job-level lock using this.api?.lock().
Ensured that only one primary instance clears lost connections in distributed or MS mode environments, while other instances safely return.
Implemented a proper try-finally block to guarantee the safe release of the lock after execution.

Summary by CodeRabbit

Bug Fixes
- Improved reliability of the presence system's cleanup process by implementing better concurrency handling to prevent multiple simultaneous operations from conflicting with each other.

…MS mode

dionisio-bot · 2026-06-17T13:01:19Z

Looks like this PR is not ready to merge, because of the following issues:

This PR is missing the 'stat: QA assured' label
This PR is missing the required milestone or project

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

changeset-bot · 2026-06-17T13:01:31Z

⚠️ No Changeset found

Latest commit: 862978c

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

coderabbitai · 2026-06-17T13:01:45Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 7eaa5bb7-5cba-4135-9f4b-e86ff6d4f989

📥 Commits

Reviewing files that changed from the base of the PR and between 928346f and 52fc22b.

📒 Files selected for processing (1)

ee/packages/presence/src/Presence.ts

📜 Recent review details

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)

GitHub Check: cubic · AI code reviewer

🧰 Additional context used

📓 Path-based instructions (1)

**/*.{ts,tsx,js}

📄 CodeRabbit inference engine (.cursor/rules/playwright.mdc)

**/*.{ts,tsx,js}: Write concise, technical TypeScript/JavaScript with accurate typing in Playwright tests
Avoid code comments in the implementation

Files:

ee/packages/presence/src/Presence.ts

🧠 Learnings (3)

📚 Learning: 2026-02-26T19:25:44.063Z

Learnt from: gabriellsh
Repo: RocketChat/Rocket.Chat PR: 38778
File: packages/ui-voip/src/providers/useMediaSession.ts:192-192
Timestamp: 2026-02-26T19:25:44.063Z
Learning: In the Rocket.Chat repository, do not reference Biome lint rules in code review feedback. Biome is not used even if biome.json exists; only reference Biome rules if there is explicit, project-wide usage documented. For TypeScript files, review lint implications without Biome guidance unless the project enables Biome rules.

Applied to files:

ee/packages/presence/src/Presence.ts

📚 Learning: 2026-02-26T19:25:44.063Z

Learnt from: gabriellsh
Repo: RocketChat/Rocket.Chat PR: 38778
File: packages/ui-voip/src/providers/useMediaSession.ts:192-192
Timestamp: 2026-02-26T19:25:44.063Z
Learning: In this repository (RocketChat/Rocket.Chat), Biome lint rules are not used even if a biome.json exists. When reviewing TypeScript files (e.g., packages/ui-voip/src/providers/useMediaSession.ts), ensure lint suggestions do not reference Biome-specific rules. Rely on general ESLint/TypeScript lint rules and project conventions instead.

Applied to files:

ee/packages/presence/src/Presence.ts

📚 Learning: 2026-05-06T12:21:44.083Z

Learnt from: juliajforesti
Repo: RocketChat/Rocket.Chat PR: 40256
File: apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx:121-149
Timestamp: 2026-05-06T12:21:44.083Z
Learning: Field wrappers in rocket.chat/fuselage-forms (Field, FieldLabel, FieldRow, FieldError, FieldHint) auto-create htmlFor/id associations, aria-describedby, and role="alert" for errors. Do not manually set htmlFor, id, aria-describedby, or role attributes when using these wrappers. This automatic wiring does not apply to plain rocket.chat/fuselage components, which require explicit ID wiring per the accessibility docs. In code reviews, prefer using fuselage-forms wrappers for form fields and verify there is no unnecessary manual ID/aria wiring in files that use these wrappers. If a component uses plain fuselage components, ensure proper id wiring as per docs.

Applied to files:

ee/packages/presence/src/Presence.ts

🔇 Additional comments (1)

ee/packages/presence/src/Presence.ts (1)

87-97: LGTM!

Walkthrough

The lostConTimeout callback in Presence.started() now acquires a distributed lock (presence.removeLostConnections, 5000ms timeout) before executing removeLostConnections() and updating user presence. If the lock is unavailable, the callback exits early. The lock is released in a finally block.

Changes

Distributed lock for lost-connection cleanup

Layer / File(s)	Summary
Distributed lock around `removeLostConnections` callback `ee/packages/presence/src/Presence.ts`	`lostConTimeout` callback wraps the `removeLostConnections()` call and per-user presence updates in an `api.lock('presence.removeLostConnections', 5000)` acquisition. Returns early if the lock is not obtained; releases the lock in a `try/finally` block.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~5 minutes

Suggested labels

type: bug

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The PR title clearly summarizes the main change: adding a distributed lock to prevent redundant cross-instance operations in the Presence service during scheduled cleanup.
Linked Issues check	✅ Passed	The code change directly addresses issue `#40973` by implementing a distributed lock mechanism via this.api?.lock() to serialize removeLostConnections execution across instances.
Out of Scope Changes check	✅ Passed	The changes are narrowly scoped to the Presence.started() method and focus exclusively on adding distributed locking around the removeLostConnections operation as required.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

cubic-dev-ai

No issues found across 1 file

_{Re-trigger cubic}

…nto fix/presence-cross-instance-reads-lock

ricardogarim · 2026-07-20T14:24:38Z

Thanks @ZunedKhan07! Closing this one — the problem it targets (deduping cross-instance presence work in MS mode) is already being solved in #41153, which moves status expiration onto @rocket.chat/cron. Agenda's Mongo job lock guarantees a single instance runs each job, which is the "job-level lock" this was reaching for, and it also clears the TODO #40973 was generated from. Appreciate the contribution! 🙏

ZunedKhan07 · 2026-07-20T14:35:28Z

Thanks for the update and clarification, Ricardo! Glad to know the issue is being handled in #41153. Looking forward to contributing more to Rocket.Chat.

…

On Mon, 20 Jul, 2026, 7:55 pm Ricardo Garim, ***@***.***> wrote: *ricardogarim* left a comment (RocketChat/Rocket.Chat#40987) <#40987 (comment)> Thanks @ZunedKhan07 <https://github.com/ZunedKhan07>! Closing this one — the problem it targets (deduping cross-instance presence work in MS mode) is already being solved in #41153 <#41153>, which moves status expiration onto @rocket.chat/cron. Agenda's Mongo job lock guarantees a single instance runs each job, which is the "job-level lock" this was reaching for, and it also clears the TODO #40973 <#40973> was generated from. Appreciate the contribution! 🙏 — Reply to this email directly, view it on GitHub <#40987?email_source=notifications&email_token=BOSIAX3QRR7WSRNYV2NZ2U35FYTT3A5CNFSNUABFM5UWIORPF5TWS5BNNB2WEL2JONZXKZKDN5WW2ZLOOQXTKMBSGMZTIMZQG432M4TFMFZW63VHNVSW45DJN5XKKZLWMVXHJLDGN5XXIZLSL5RWY2LDNM#issuecomment-5023343077>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/BOSIAX7KOHAEJFLXX3P22O35FYTT3AVCNFSNUABEKJSXA33TNF2G64TZHMZTKOBWGY3DSNB3JFZXG5LFHM2DMOBTGQ3TONZZGOQXMAQ> . Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS <https://github.com/notifications/mobile/ios/BOSIAX74Q33RAW4JH7OSWRT5FYTT3A5CNFSNUABFM5UWIORPF5TWS5BNNB2WEL2JONZXKZKDN5WW2ZLOOQXTKMBSGMZTIMZQG432M4TFMFZW63VHNVSW45DJN5XKKZLWMVXHJKTGN5XXIZLSL5UW64Y> and Android <https://github.com/notifications/mobile/android/BOSIAX6OJOT6YHIS3G7EK235FYTT3A5CNFSNUABFM5UWIORPF5TWS5BNNB2WEL2JONZXKZKDN5WW2ZLOOQXTKMBSGMZTIMZQG432M4TFMFZW63VHNVSW45DJN5XKKZLWMVXHJLTGN5XXIZLSL5QW4ZDSN5UWI>. Download it today! You are receiving this because you were mentioned.Message ID: ***@***.***>

fix: add job-level lock to prevent redundant cross-instance reads in …

52fc22b

…MS mode

dionisio-bot Bot added the community label Jun 17, 2026

coderabbitai Bot added the type: bug label Jun 17, 2026

cubic-dev-ai Bot reviewed Jun 17, 2026

View reviewed changes

ZunedKhan07 added 2 commits July 19, 2026 13:34

Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…

6b5acf8

…nto fix/presence-cross-instance-reads-lock

fix: presence cross instance reads lock

862978c

ricardogarim closed this Jul 20, 2026

Navigation Menu

Uh oh!

fix: add job-level lock to prevent redundant cross-instance reads in …fix: Add job-level lock to prevent redundant cross-instance reads in Presence service - #40987

fix: add job-level lock to prevent redundant cross-instance reads in …fix: Add job-level lock to prevent redundant cross-instance reads in Presence service#40987
ZunedKhan07 wants to merge 3 commits into
RocketChat:developfrom
ZunedKhan07:fix/presence-cross-instance-reads-lock

ZunedKhan07 commented Jun 17, 2026 •

edited by coderabbitai Bot

Loading

Uh oh!

dionisio-bot Bot commented Jun 17, 2026

Uh oh!

changeset-bot Bot commented Jun 17, 2026 •

edited

Loading

Uh oh!

coderabbitai Bot commented Jun 17, 2026 •

edited

Loading

Uh oh!

cubic-dev-ai Bot left a comment

Uh oh!

ricardogarim commented Jul 20, 2026

Uh oh!

ZunedKhan07 commented Jul 20, 2026 via email

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

ZunedKhan07 commented Jun 17, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Changes

Summary by CodeRabbit

Uh oh!

dionisio-bot Bot commented Jun 17, 2026

Uh oh!

changeset-bot Bot commented Jun 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ No Changeset found

Uh oh!

coderabbitai Bot commented Jun 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

Suggested labels

Uh oh!

cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

ricardogarim commented Jul 20, 2026

Uh oh!

ZunedKhan07 commented Jul 20, 2026 via email

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ZunedKhan07 commented Jun 17, 2026 •

edited by coderabbitai Bot

Loading

changeset-bot Bot commented Jun 17, 2026 •

edited

Loading

coderabbitai Bot commented Jun 17, 2026 •

edited

Loading