Skip to content

[stable9.1] Backport of filecache repair step OLD #29407

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

Closed
tomneedham wants to merge 15 commits into from
Closed

[stable9.1] Backport of filecache repair step OLD #29407

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ebaa762
Add repair step to repair mismatch filecache paths
Jun 28, 2017
0980191
Repair detached filecache entries through occ files:scan
Jul 26, 2017
f79837d
Use DI and add more tests for storage filter
Aug 2, 2017
d6688a2
Run phase 2 of repair on gathered affected storages from phase 1
Aug 16, 2017
de8295c
occ files:scan --all --repair repairs all storages at once
Aug 16, 2017
ad2c23c
Improve output when repairing. Fix non-repair file:scan
tomneedham Aug 18, 2017
1ac999e
Add parallel non-corrupt storages to filecache repair step to check f…
tomneedham Sep 12, 2017
25edcf7
Test without parallel storages
tomneedham Sep 14, 2017
1a16772
Fix lastinsertid for postgres wehn reusing fileid
tomneedham Sep 14, 2017
38d8ce0
Try oracle tests without throwing exception for stray transactions
tomneedham Sep 15, 2017
3f3340e
Oracle hates empty strings
Sep 18, 2017
238728d
Workaround for Oracle trigger for fileid
Sep 19, 2017
bf3e4bf
Cleanup testcase and comments
tomneedham Sep 20, 2017
6f5f26a
Modify backported repair step for 9.1
tomneedham Nov 1, 2017
e81442e
Modify backported repair step for 9.1
tomneedham Nov 1, 2017
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
Modify backported repair step for 9.1
  • Loading branch information
@tomneedham
tomneedham authored and Vincent Petry committed Nov 7, 2017
commit e81442e20de65419d36177893fb170beabf24eac
2 changes: 1 addition & 1 deletion apps/files/lib/Command/Scan.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ protected function scanFiles($user, $path, $verbose, OutputInterface $output, $b
try {
// FIXME: this will lock the storage even if there is nothing to repair
$storage->acquireLock('', ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider);
} catch (OCP\Lock\LockedException $e) {
} catch (LockedException $e) {
$output->writeln("\t<error>Storage \"" . $storage->getCache()->getNumericStorageId() . '" cannot be repaired as it is currently in use, please try again later</error>');
return;
}
Expand Down
12 changes: 6 additions & 6 deletions tests/lib/Repair/RepairMismatchFileCachePathTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ protected function setUp() {

$this->connection = \OC::$server->getDatabaseConnection();

$mimeLoader = $this->createMock(IMimeTypeLoader::class);
$mimeLoader = $this->getMockBuilder(IMimeTypeLoader::class)->getMock();
$mimeLoader->method('getId')
->will($this->returnValueMap([
['httpd', 1],
Expand Down Expand Up @@ -205,7 +205,7 @@ public function testRepairEntry($sourceStorageId, $targetStorageId, $targetDir,

$doNotTouchId = $this->createFileCacheEntry($sourceStorageId, 'files/source/do_not_touch', $sourceId);

$outputMock = $this->createMock(IOutput::class);
$outputMock = $this->getMockBuilder(IOutput::class)->getMock();
if (is_null($repairStoragesOrder)) {
// no storage selected, full repair
$this->repair->setStorageNumericId(null);
Expand Down Expand Up @@ -345,7 +345,7 @@ public function testRepairSelfReferencing() {
// End parallel storage


$outputMock = $this->createMock(IOutput::class);
$outputMock = $this->getMockBuilder(IOutput::class)->getMock();
$this->repair->setStorageNumericId($storageId);
$this->repair->run($outputMock);

Expand Down Expand Up @@ -535,7 +535,7 @@ public function testRepairParentIdPointingNowhere() {
$wrongParentRootId = $this->createFileCacheEntry($storageId, 'wrongparentroot', $nonExistingParentId);
$wrongParentId = $this->createFileCacheEntry($storageId, 'files/wrongparent', $nonExistingParentId);

$outputMock = $this->createMock(IOutput::class);
$outputMock = $this->getMockBuilder(IOutput::class)->getMock();
$this->repair->setStorageNumericId($storageId);
$this->repair->run($outputMock);

Expand Down Expand Up @@ -593,7 +593,7 @@ public function testRepairDetachedSubtree() {
$notOrphanedId2_parallel = $this->createFileCacheEntry($storageId_parallel, 'missingdir/missingdir1/orphaned2', $notOrphanedFolder2_parallel);
// end parallel test storage

$outputMock = $this->createMock(IOutput::class);
$outputMock = $this->getMockBuilder(IOutput::class)->getMock();
$this->repair->setStorageNumericId($storageId);
$this->repair->run($outputMock);

Expand Down Expand Up @@ -700,7 +700,7 @@ public function testRepairMissingRoot() {
$noRootid = $this->createFileCacheEntry($testStorageId, 'noroot', $baseId);


$outputMock = $this->createMock(IOutput::class);
$outputMock = $this->getMockBuilder(IOutput::class)->getMock();
$this->repair->setStorageNumericId($storageId);
$this->repair->run($outputMock);

Expand Down