Skip to content

fix(search): don't block message listing on a mailbox sync lock #13208

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

Closed
ktogias wants to merge 6 commits into from
+40 −12
Closed

fix(search): don't block message listing on a mailbox sync lock #13208

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e47a64
fix(search): don't block message listing on a mailbox sync lock
ktogias Jul 3, 2026
28946a1
fix(mailbox): correct hasLocks() expiry check
ktogias Jul 3, 2026
cbbf00e
Merge branch 'main' into fix/listing-not-blocked-by-sync-lock
ktogias Jul 3, 2026
383c137
fix(search): findMessages() must never block on a sync lock at all
ktogias Jul 3, 2026
1ccbac8
Merge remote-tracking branch 'origin/fix/listing-not-blocked-by-sync-…
ktogias Jul 3, 2026
666048b
amend! fix(search): don't block message listing on a mailbox sync lock
ktogias Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/Service/Search/MailSearch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
use OCA\Mail\Db\Message;
use OCA\Mail\Db\MessageMapper;
use OCA\Mail\Exception\ClientException;
use OCA\Mail\Exception\MailboxLockedException;
use OCA\Mail\Exception\MailboxNotCachedException;
use OCA\Mail\Exception\ServiceException;
use OCA\Mail\IMAP\PreviewEnhancer;
Expand Down Expand Up @@ -77,9 +76,12 @@ public function findMessages(Account $account,
?int $limit,
?string $userId,
?string $view): array {
if ($mailbox->hasLocks($this->timeFactory->getTime())) {
throw MailboxLockedException::from($mailbox);
}
// A mailbox sync lock coordinates concurrent *writes* (two sync
// attempts racing on the same mailbox); it was never a correctness
// requirement for a *read*. This method only ever reads from the
// local DB below (aside from an unrelated body-text-search path),
// so a mailbox mid-sync or currently locked can still be listed
// from its already-cached messages instead of failing outright.
if (!$mailbox->isCached()) {
throw MailboxNotCachedException::from($mailbox);
}
Expand Down
19 changes: 14 additions & 5 deletions tests/Unit/Service/Search/MailSearchTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use OCA\Mail\Db\Mailbox;
use OCA\Mail\Db\Message;
use OCA\Mail\Db\MessageMapper;
use OCA\Mail\Exception\MailboxLockedException;
use OCA\Mail\Exception\MailboxNotCachedException;
use OCA\Mail\IMAP\PreviewEnhancer;
use OCA\Mail\IMAP\Search\Provider;
Expand Down Expand Up @@ -81,13 +80,21 @@ public function testFindMessagesNotCached() {
);
}

public function testFindMessagesLocked() {
$account = $this->createStub(Account::class);
public function testFindMessagesIgnoresLock() {
$account = $this->createMock(Account::class);
$account->expects($this->once())
->method('getUserId')
->willReturn('admin');
$mailbox = new Mailbox();
$mailbox->setSyncNewToken('abc');
$mailbox->setSyncChangedToken('def');
$mailbox->setSyncVanishedToken('ghi');
// A concurrent sync attempt is (or recently was) holding a lock on
// this mailbox -- findMessages() only reads already-cached
// messages, so it must not be blocked by it.
$mailbox->setSyncNewLock(123);
$this->expectException(MailboxLockedException::class);

$this->search->findMessages(
$messages = $this->search->findMessages(
$account,
$mailbox,
'DESC',
Expand All @@ -97,6 +104,8 @@ public function testFindMessagesLocked() {
null,
null,
);

$this->assertEmpty($messages);
}

public function testNoFindMessages() {
Expand Down