Skip to content

[stable9] Filecache repair step #29045

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 20 commits into from
Closed

[stable9] Filecache repair step #29045

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2f498c3
Add repair step to repair mismatch filecache paths
Jun 28, 2017
3865b82
Repair detached filecache entries through occ files:scan
Jul 26, 2017
0a27f68
Use DI and add more tests for storage filter
Aug 2, 2017
16fa84a
Run phase 2 of repair on gathered affected storages from phase 1
Aug 16, 2017
0b3a081
occ files:scan --all --repair repairs all storages at once
Aug 16, 2017
e000e7f
Improve output when repairing. Fix non-repair file:scan
tomneedham Aug 18, 2017
aa4f3e7
Add parallel non-corrupt storages to filecache repair step to check f…
tomneedham Sep 12, 2017
b8e0971
Test without parallel storages
tomneedham Sep 14, 2017
9584e83
Fix lastinsertid for postgres wehn reusing fileid
tomneedham Sep 14, 2017
ad4e194
Try oracle tests without throwing exception for stray transactions
tomneedham Sep 15, 2017
c2ef84e
Make filecache repair step work with oc9
tomneedham Sep 18, 2017
cbcf9c1
fix casing of new repair step
tomneedham Sep 18, 2017
62a4ad7
Oracle hates empty strings
Sep 18, 2017
046b1cb
Cleanup testcase and comments
tomneedham Sep 20, 2017
d121337
Fix path casing
tomneedham Sep 29, 2017
b9156da
Dont use create mock
tomneedham Sep 29, 2017
6793bbb
Catch output advance method
tomneedham Sep 29, 2017
cce6f98
Make this work with php5.4
tomneedham Sep 29, 2017
0414613
Workaround for Oracle trigger for fileid
Sep 19, 2017
5756f18
use path hash for repair step comparison for performance
tomneedham Nov 6, 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
use path hash for repair step comparison for performance
  • Loading branch information
@tomneedham
tomneedham committed Nov 6, 2017
commit 5756f189c2e8b0684f9f25aa840f21fd132cd492
4 changes: 2 additions & 2 deletions lib/private/repair/repairmismatchfilecachepath.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ private function fixEntryPath(LogOutput $out, $fileId, $wrongPath, $correctStora
if ($correctPath === '' && $this->connection->getDatabasePlatform() instanceof OraclePlatform) {
$qb->andWhere($qb->expr()->isNull('path'));
} else {
$qb->andWhere($qb->expr()->eq('path', $qb->createNamedParameter($correctPath)));
$qb->andWhere($qb->expr()->eq('path_hash', md5($qb->createNamedParameter($correctPath))));
}
$entryExisted = $qb->execute() > 0;

Expand Down Expand Up @@ -372,7 +372,7 @@ private function getOrCreateEntry($storageId, $path, $reuseFileId = null) {
if ($path === '' && $this->connection->getDatabasePlatform() instanceof OraclePlatform) {
$qb->andWhere($qb->expr()->isNull('path'));
} else {
$qb->andWhere($qb->expr()->eq('path', $qb->createNamedParameter($path)));
$qb->andWhere($qb->expr()->eq('path_hash', md5($qb->createNamedParameter($path))));
}
$results = $qb->execute();
$rows = $results->fetchAll();
Expand Down