[stable29] multi-instance object store tweaks #57141
Conversation
Signed-off-by: Kent Delante <kent.delante@proton.me>
leftybournes
force-pushed
the
leftybournes/fix/stable29-backports
branch
from
e7af913 to
8089fab
Compare
Signed-off-by: Kent Delante <kent.delante@proton.me>
leftybournes
force-pushed
the
leftybournes/fix/stable29-backports
branch
from
8f6158a to
1a58a72
Compare
Signed-off-by: Kent Delante <kent.delante@proton.me>
Signed-off-by: Kent Delante <kent.delante@proton.me>
leftybournes
force-pushed
the
leftybournes/fix/stable29-backports
branch
from
1a58a72 to
32cb3bb
Compare
|
I'm not sure if a move command like this is the correct option. (Only setting the stored instance, not moving an actual object). Or if we want to extend https://github.com/nextcloud/multibucket_migrate instead, which does perform the object moving. |
| $count = 0; | ||
| foreach ($users as $user) { | ||
| if (!$input->getOption('dry-run')) { | ||
| $this->config->setUserValue($user->getUID(), 'homeobjectstore', 'objectstore', $objectStore); |
There was a problem hiding this comment.
If we go with this version of the move command, I think it makes sense to validate that the target object store is valid for the user.
We could get the fileid for one of the user's files (if the user has at least one file) and check if an object with the matching urn exists it the target object store.
Without any checks the command would risk being a big footgun.
|
Outside of the |
Signed-off-by: Kent Delante <kent.delante@proton.me>
leftybournes
force-pushed
the
leftybournes/fix/stable29-backports
branch
from
6b1a26e to
fc30176
Compare
I think extending multibucket_migrate is the way to go since that's already available instead of adding the move command. |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| } | ||
|
|
||
| $homeStorage = $homeMount->getStorage(); | ||
| $storageId = $homeStorage->getCache()->getNumericStorageId(); |
Check notice
Code scanning / Psalm
PossiblyNullReference Note
| ->from('filecache') | ||
| ->where($query->expr()->eq('storage', $query->createNamedParameter($storageId, IQueryBuilder::PARAM_INT))) | ||
| ->andWhere($query->expr()->neq('mimetype', $query->createNamedParameter($folderMimetype, IQueryBuilder::PARAM_INT))); | ||
| $result = $query->execute(); |
Check notice
Code scanning / Psalm
DeprecatedMethod Note
| ->where($query->expr()->eq('storage', $query->createNamedParameter($storageId, IQueryBuilder::PARAM_INT))) | ||
| ->andWhere($query->expr()->neq('mimetype', $query->createNamedParameter($folderMimetype, IQueryBuilder::PARAM_INT))); | ||
| $result = $query->execute(); | ||
| $fileIds = $result->fetchAll(\PDO::FETCH_COLUMN); |
Check notice
Code scanning / Psalm
PossiblyInvalidMethodCall Note
| $query = $this->connection->getQueryBuilder(); | ||
| $query->select('fileid') | ||
| ->from('filecache') | ||
| ->where($query->expr()->eq('storage', $query->createNamedParameter($storageId, IQueryBuilder::PARAM_INT))) | ||
| ->andWhere($query->expr()->neq('mimetype', $query->createNamedParameter($folderMimetype, IQueryBuilder::PARAM_INT))); | ||
| $result = $query->execute(); |
There was a problem hiding this comment.
Since we already have the storage/cache, we can just do $storage->getCache()->getId('')
There was a problem hiding this comment.
Wouldn't that give the id of a user's root folder, which doesn't get saved as an object?
Signed-off-by: Kent Delante <kent.delante@proton.me>
leftybournes
force-pushed
the
leftybournes/fix/stable29-backports
branch
from
a3fbe3d to
84f7093
Compare
| } | ||
|
|
||
| $currentBucket = $this->objectStoreConfig->getSetBucketForUser($user); | ||
| if (!$currentBucket) { |
Check notice
Code scanning / Psalm
RiskyTruthyFalsyComparison Note
No description provided.