Skip to content

[stable24] Revert "Revert "Remove inefficient fed share scanner"" #33455

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

Merged
PVince81 merged 3 commits into from
Aug 4, 2022
Merged

[stable24] Revert "Revert "Remove inefficient fed share scanner"" #33455

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ac96a4
Revert "Revert "Remove inefficient fed share scanner""
CarlSchwan Jun 13, 2022
c0a18cb
Disable locking on federated shares
CarlSchwan Jun 17, 2022
1d66a53
fix external share scanner not propagating locking-opt-out
icewind1991 Aug 3, 2022
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
Prev Previous commit
Next Next commit
Disable locking on federated shares 
The old inneficiant code didn't do locking and adding locking is
creating issues

Signed-off-by: Carl Schwan <[email protected]>
  • Loading branch information
@CarlSchwan @backportbot-nextcloud
CarlSchwan authored and backportbot-nextcloud[bot] committed Aug 4, 2022
commit c0a18cbb87803befece881e7cbbaf23a8d2aba3c
5 changes: 5 additions & 0 deletions apps/files_sharing/lib/External/Scanner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ class Scanner extends \OC\Files\Cache\Scanner {
/** @var \OCA\Files_Sharing\External\Storage */
protected $storage;

public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
// Disable locking for federated shares
parent::scan($path, $recursive, $reuse, false);
}

/**
* Scan a single file and store it in the cache.
* If an exception happened while accessing the external storage,
Expand Down