Skip to content
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.

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

[stable9.1] Skip local shares in bkg scan and occ files:scan (#26590) #26600

Merged

Conversation

DeepDiver1975
Copy link
Member

backport #26590

Local shares should only be scanned when doing it for the owner to
avoid repeatedly rescanning the same shared storage over and over again
for every recipient.

@DeepDiver1975 DeepDiver1975 added this to the 9.1.3 milestone Nov 10, 2016
@mention-bot
Copy link

@DeepDiver1975, thanks for your PR! By analyzing the history of the files in this pull request, we identified @icewind1991, @MorrisJobke and @LukasReschke to be potential reviewers.

@PVince81
Copy link
Contributor

Ah, backports are tougher these days:

15:57:53 1) Test\Files\Utils\ScannerTest::testSkipLocalShares
15:57:53 Error: Call to undefined method Test\Files\Utils\ScannerTest::createMock()
15:57:53 
15:57:53 /var/lib/jenkins/workspace/owncloud-core_core_PR-26600-DYJHC7FCYTC7IG6JNX5G5NU3BBFZO73BQJ26TDGL4HM66DZ6ZCDA/tests/lib/Files/Utils/ScannerTest.php:192

Local shares should only be scanned when doing it for the owner to
avoid repeatedly rescanning the same shared storage over and over again
for every recipient.
@DeepDiver1975 DeepDiver1975 force-pushed the stable9.1-d1c844093539a2d0bf89fd5068e85448c11a8be9 branch from 39b6ac3 to 556eb1d Compare November 10, 2016 15:41
@DeepDiver1975
Copy link
Member Author

????

 Test\Files\Utils\ScannerTest.testSkipLocalShares
 Stack Trace

Test\Files\Utils\ScannerTest::testSkipLocalShares
strpos() expects parameter 1 to be string, object given

/var/lib/jenkins/workspace/owncloud-core_core_PR-26600-DYJHC7FCYTC7IG6JNX5G5NU3BBFZO73BQJ26TDGL4HM66DZ6ZCDA/lib/private/Files/Mount/MountPoint.php:99
/var/lib/jenkins/workspace/owncloud-core_core_PR-26600-DYJHC7FCYTC7IG6JNX5G5NU3BBFZO73BQJ26TDGL4HM66DZ6ZCDA/tests/lib/Files/Utils/ScannerTest.php:193

@PVince81
Copy link
Contributor

Fixed mocked class name, in OC < 9.2 it's quite twisted

@PVince81
Copy link
Contributor

Manually retested both bkg scan and occ files:scan, they properly skip received shares 👍

@DeepDiver1975
Copy link
Member Author

👍

@DeepDiver1975 DeepDiver1975 merged commit f118ac6 into stable9.1 Nov 22, 2016
@DeepDiver1975 DeepDiver1975 deleted the stable9.1-d1c844093539a2d0bf89fd5068e85448c11a8be9 branch November 22, 2016 16:15
@lock
Copy link

lock bot commented Aug 4, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Aug 4, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants