Skip to content

fix searching all users in repair regenerate birthday cal reparir job - #15141

Merged
rullzer merged 2 commits into
masterfrom
fix/noid/regenerate-seen-users-only
Apr 24, 2019
Merged

fix searching all users in repair regenerate birthday cal reparir job #15141
rullzer merged 2 commits into
masterfrom
fix/noid/regenerate-seen-users-only

Conversation

@blizzz

@blizzzblizzz commented Apr 17, 2019

Copy link
Copy Markdown
Member

The problem: my dev system on upgrade is working on that for almost an hour now…

  • this avoids searches across all users on all backends
  • most, if not all, are known anyhow
  • for those that aren't there is no reason to act upon
  • with only known users it will be tremendeously faster… but it would still be best if this could be done in a background job instead and not blocking upgrade

@blizzzblizzz added this to the Nextcloud 17 milestone Apr 17, 2019
@blizzzblizzz changed the title avoids users searches on backend, faster processingfix searching all users in repair regenerate birthday cal reparir job Apr 17, 2019
@georgehrke

georgehrke commented Apr 17, 2019

Copy link
Copy Markdown
Member

Would it be better to replace this as well?

server/apps/dav/lib/Controller/BirthdayCalendarController.php

Line 96 in 5382eec

$this->userManager->callForAllUsers(function(IUser$user) {

@blizzz

blizzz commented Apr 17, 2019

Copy link
Copy Markdown
MemberAuthor

Would it be better to replace this as well?

server/apps/dav/lib/Controller/BirthdayCalendarController.php

Line 96 in 5382eec
$this->userManager->callForAllUsers(function(IUser $user) {

aye

@blizzz

blizzz commented Apr 17, 2019

Copy link
Copy Markdown
MemberAuthor

and found two other spots

@blizzz
avoids users searches on backend, faster processing
1d1c8b4
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz
blizzzforce-pushed the fix/noid/regenerate-seen-users-only branch from b02b6ca to 299f4d5CompareApril 17, 2019 13:55
@blizzz

blizzz commented Apr 17, 2019

Copy link
Copy Markdown
MemberAuthor

@georgehrke but is there a reason to have it a repair step, not a background job that can be run once after upgrade is done?

@blizzz

blizzz commented Apr 23, 2019

Copy link
Copy Markdown
MemberAuthor

Anyway, i think we should merge and backport it, otherwise setups with a serious backend will have a long lasted upgrade. For .1 we can perhaps turn it to background job if possible.

georgehrke
georgehrke reviewed Apr 23, 2019
View reviewed changes
Comment threadapps/dav/lib/CardDAV/SyncService.php
public function syncInstance(\Closure $progressCallback = null) {
$systemAddressBook = $this->getLocalSystemAddressBook();
$this->userManager->callForAllUsers(function($user) use ($systemAddressBook, $progressCallback) {
$this->userManager->callForSeenUsers(function($user) use ($systemAddressBook, $progressCallback) {

@georgehrkegeorgehrkeApr 23, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@schiessle Will this have any negative effect on federation?

@blizzzblizzzApr 23, 2019•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

why should this affect federation? allForSeenUsers cycles over all known users. callForAllUsersmight bring in new ones, but in any case it brings in a lot of overhead.

@georgehrkegeorgehrkeApr 23, 2019•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

syncInstance syncs the address book containing all users for federation. So instead of all users only users that have logged in before will be synced (i assume).

@blizzzblizzzApr 23, 2019

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

No, all the users known to Nextcloud. This can be more than have logged in.

@georgehrke

georgehrke commented Apr 23, 2019

Copy link
Copy Markdown
Member

but is there a reason to have it a repair step, not a background job that can be run once after upgrade is done?

The migration step doesn't generate all the birthday calendars itself, it only registers jobs to generate them later on in the background.

@blizzz
blizzz requested a review from schiessleApril 23, 2019 10:20
@blizzz

blizzz commented Apr 23, 2019

Copy link
Copy Markdown
MemberAuthor

The migration step doesn't generate all the birthday calendars itself, it only registers jobs to generate them later on in the background.

Then, this should be fine. Search external backends is expensive.

@blizzz
blizzzforce-pushed the fix/noid/regenerate-seen-users-only branch from 299f4d5 to 44a67ceCompareApril 24, 2019 13:51
@blizzz
remove obsolete use statements
96bab4f
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz
blizzzforce-pushed the fix/noid/regenerate-seen-users-only branch from 44a67ce to 96bab4fCompareApril 24, 2019 14:25
@blizzz

blizzz commented Apr 24, 2019

Copy link
Copy Markdown
MemberAuthor

/backport to stable16

@rullzer
rullzer merged commit 3394665 into masterApr 24, 2019
@rullzer
rullzer deleted the fix/noid/regenerate-seen-users-only branch April 24, 2019 17:58
@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Apr 24, 2019
Merged
@backportbot-nextcloud

backportbot-nextcloudBot commented Apr 24, 2019

Copy link
Copy Markdown

backport to stable16 in #15219

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@georgehrkegeorgehrkegeorgehrke approved these changes
@rullzerrullzerrullzer approved these changes
@MorrisJobkeMorrisJobkeAwaiting requested review from MorrisJobke
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst
@ArtificialOwlArtificialOwlAwaiting requested review from ArtificialOwl
@schiessleschiessleAwaiting requested review from schiessle

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Milestone

Nextcloud 17

Development

Successfully merging this pull request may close these issues.

3 participants

@blizzz@georgehrke@rullzer