-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
Don't die with LockedException when removing/restoring multiple files from trash #28438
Conversation
ea801ce
to
ee41c31
Compare
@@ -968,9 +968,21 @@ private static function getVersionsFromTrash($filename, $timestamp, $user) { | |||
[$storage,] = $view->resolvePath('/'); | |||
|
|||
//force rescan of versions, local storage may not have updated the cache |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not fully sure about that logic at all, i cannot see why the rescan might be needed these days unless there is an issue with moving the versions there initially. But might be a legacy leftover, maybe @icewind1991 or @PVince81 have any further insight?
Intial scanning introduced in 0254a3c#diff-25ac00f6c51dc1ab8783ce98d51cec3d11a46f104c141a9a0df1896d2bfd31efR923-R924
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not sure. and even stranger that this was introduced as part of primary object store, which would usually not be affected by this
… from trash fixes issue nextcloud#16491 Signed-off-by: Sven Strickroth <email@cs-ware.de>
One test is failing, however, I can't see why. A hint might be really helpful. |
likely a false positive |
Any news? |
I', using this for several weeks and it works. |
Hello and thank you for solving this annoying problem. |
/backport to stable23 |
/backport to stable22 |
fixes issue #16491
TODO: Maybe in medium term the whole restore/delete from trash activity should be guarded by a lock.