Skip to content

Revert "Remove inefficient fed share scanner" #32806

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
Merged
merged 1 commit into from
Jun 10, 2022
Merged

Revert "Remove inefficient fed share scanner" #32806

merged 1 commit into from
Jun 10, 2022

Conversation

@CarlSchwan
Copy link
Member

This reverts commit ce31914. This is causing some issue.

"files/xxxxxxxxxxxxxxxxxxxxxxxxx"("shared::xxxxxxxxxxxxxxxxxxxxxxxxxx::a-file.deb") is locked, existing lock on file: exclusive

Signed-off-by: Carl Schwan carl@carlschwan.eu

@CarlSchwan
Revert "Remove inefficient fed share scanner"
6667007 
This reverts commit ce31914.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
@CarlSchwan CarlSchwan requested review from a team, PVince81, come-nc and skjnldsv and removed request for a team June 10, 2022 08:33
github-advanced-security[bot]
github-advanced-security bot found potential problems Jun 10, 2022
View reviewed changes
apps/files_sharing/lib/External/Scanner.php
* @throws StorageInvalidException
* @throws \Exception
*/
public function scanAll() {

Check notice

Code scanning / Psalm

MissingReturnType

Method OCA\Files_Sharing\External\Scanner::scanAll does not have a return type, expecting void
apps/files_sharing/lib/External/Scanner.php
* @param array $data
* @param string $path
*/
private function addResult($data, $path) {

Check notice

Code scanning / Psalm

MissingReturnType

Method OCA\Files_Sharing\External\Scanner::addResult does not have a return type, expecting void
@skjnldsv skjnldsv added bug 2. developing Work in progress labels Jun 10, 2022
@PVince81
Copy link
Member

this will bring back major performance issues unfortunately, so would be only a temporary solution until the locking issue is analyzed and solved on its own

@icewind1991

@CarlSchwan CarlSchwan requested a review from juliusknorr June 10, 2022 08:59
@CarlSchwan CarlSchwan added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 10, 2022
@CarlSchwan CarlSchwan mentioned this pull request Jun 10, 2022
Merged
2 tasks
@PVince81 PVince81 merged commit 6ee4e0b into master Jun 10, 2022
@PVince81 PVince81 deleted the fix-federated-sharing branch June 10, 2022 13:47
@PVince81
Copy link
Member

merging for now to solve the issue, let's bring it back separately and at the same time solve the locking issue

@CarlSchwan please raise a ticket (and a revert-revert WIP PR)

@PVince81
Copy link
Member

/backport to stable24

@PVince81
Copy link
Member

/backport to stable23

@PVince81
Copy link
Member

/backport to stable22

@backportbot-nextcloud
Copy link

The backport to stable23 failed. Please do this backport manually.

@backportbot-nextcloud
Copy link

The backport to stable24 failed. Please do this backport manually.

@backportbot-nextcloud
Copy link

The backport to stable22 failed. Please do this backport manually.

@PVince81
Copy link
Member

might be easier to revert the backport from back then ?

@CarlSchwan
Copy link
Member Author

Backports:

#32848
#32849
#32851

@CarlSchwan CarlSchwan mentioned this pull request Jun 13, 2022
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blizzz blizzz blizzz approved these changes

@juliusknorr juliusknorr juliusknorr approved these changes

@PVince81 PVince81 Awaiting requested review from PVince81

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

@come-nc come-nc Awaiting requested review from come-nc

Assignees

No one assigned

Labels

3. to review Waiting for reviews bug

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@CarlSchwan @PVince81 @blizzz @juliusknorr @skjnldsv