[stable9] Filecache repair step #29491
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Whenever a parent-child relationship describes a specific path but the entry's actual path is different, this new repair step will adjust it. In the event where another entry already exists under that name, the latter is deleted and replaced by the above entry. This should help preserve the metadata associated with the original entry.
When fixing failed cross-storage moves in the file cache and using the storage id filter, we filter by target storage for phase 1. However, we also need to fix the source storages in phase 2. To do so, a list of affected source storages is now gathered in phase 1 to be run on phase 2.
This instead of iterating over all storages which is way less efficient due to the 1-N nature of potential failed cross-storage moves that we are repairing. If singleuser mode is enabled and "--all --repair" is passed, all storages will be repaired in bulk (no repair filter). If not, it will fall back to iterating over each storage which is slower.
This was referenced Nov 7, 2017
Contributor
Author
|
All green. But would be good to address my comments from the original PR: #29045 (review) |
15 tasks
tomneedham
reviewed
Nov 8, 2017
| private function countResultsToProcessParentIdWrongPath($storageNumericId = null) { | ||
| $qb = $this->connection->getQueryBuilder(); | ||
| $qb->select($qb->createFunction('COUNT(*)')); | ||
| $this->addQueryConditionsParentIdWrongPath($qb, $storageNumericId); |
Contributor
There was a problem hiding this comment.
@PVince81 can you check this - PHPStorm shows that this second param is not used in the method 👀
Contributor
Author
There was a problem hiding this comment.
ohh... some old code it seems. In the past we passed around the storage numeric id, but for this one method it just uses the local attribute now.
Contributor
Author
There was a problem hiding this comment.
nothing to worry about: the $this->storageNumericId is also passed from the outside for some methods, while other methods use the attribute directly... a bit messy, yes
PVince81
commented
Nov 8, 2017
| ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId))); | ||
| $qb->execute(); | ||
|
|
||
| $text = "Fixed file cache entry with fileid $fileId, set wrong path \"$wrongPath\" to \"$correctPath\""; |
PVince81
commented
Nov 8, 2017
|
|
||
| $storageIds = []; | ||
| foreach ($rows as $row) { | ||
| $storageIds[] = $row['storage']; |
Contributor
Author
There was a problem hiding this comment.
you killed too much, the upgrade is not reporting any more.
We need to emit an event on $this object as it's a BasicEmmiter, it will output the entry on the console
Contributor
Author
|
Contributor
Author
|
Fixed the issues and worked. |
Contributor
Author
|
@tomneedham quick review ? 002417a |
Contributor
|
Nice - and we keep some output :) 👍 |
|
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. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re-re-send of #29489 for CI
@tomneedham