Fix database locks #4819
Merged
Fix database locks #4819
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
miaulalala
requested review from
ChristophWurst,
st3iny,
kesselb,
StCyr and
GretaD
|
While testing i realized that things are a better but with the combined mailboxes(in my case 2) the problem still exist if the initial sync is in progress. |
ChristophWurst
approved these changes
Mar 25, 2021
lib/Db/MailboxMapper.php
Outdated
| @@ -119,7 +115,6 @@ public function findById(int $id): Mailbox { | |||
| * | |||
| * @return Mailbox | |||
| * | |||
| * @throws DoesNotExistException | |||
lib/Db/MailboxMapper.php
Outdated
| @@ -93,7 +90,6 @@ public function find(Account $account, string $name): Mailbox { | |||
| * | |||
| * @return Mailbox | |||
| * | |||
| * @throws DoesNotExistException | |||
lib/Db/MailboxMapper.php
Outdated
| @@ -66,7 +64,6 @@ public function findAll(Account $account): array { | |||
| } | |||
|
|
|||
| /** | |||
| * @throws DoesNotExistException | |||
lib/Db/MailboxMapper.php
Outdated
| @@ -31,13 +31,11 @@ | |||
| use OCA\Mail\Account; | |||
| use OCA\Mail\Exception\MailboxLockedException; | |||
| use OCA\Mail\Exception\ServiceException; | |||
| use OCP\AppFramework\Db\DoesNotExistException; | |||
lib/Db/MailboxMapper.php
Outdated
| use OCP\AppFramework\Db\MultipleObjectsReturnedException; | ||
| use OCP\AppFramework\Db\QBMapper; | ||
| use OCP\AppFramework\Utility\ITimeFactory; | ||
| use OCP\DB\QueryBuilder\IQueryBuilder; | ||
| use OCP\IDBConnection; | ||
| use function array_map; |
|
/backport to stable1.9 |
Signed-off-by: Anna Larch <[email protected]>
ChristophWurst
force-pushed
the
fix/database-is-locked
branch
from
b3fc064
to
00ea427
Compare
|
The backport to stable1.9 failed. Please do this backport manually. |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See #4812
Added the timestamp to the hasLocks method as to avoid only relying on tokens but not checking if they are still valid.