Skip to content

[stable25] fix: Make sure that rollback hook is triggered on all version backends#37744

Merged
blizzz merged 6 commits intostable25from
backport/36690/stable25
Jul 10, 2023
Merged

[stable25] fix: Make sure that rollback hook is triggered on all version backends#37744
blizzz merged 6 commits intostable25from
backport/36690/stable25

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Apr 14, 2023 •
edited by juliusknorr
Loading

  • ⚠️ This backport had conflicts that were resolved with the 'ours' merge strategy and is likely incomplete

backport of #36690

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 25.0.6 milestone Apr 14, 2023
@skjnldsv skjnldsv mentioned this pull request Apr 18, 2023
Merged
7 tasks
@juliusknorr juliusknorr force-pushed the backport/36690/stable25 branch from e099546 to 1507635 Compare May 5, 2023 10:31
@juliusknorr juliusknorr marked this pull request as ready for review May 5, 2023 10:31
github-advanced-security[bot]
github-advanced-security bot found potential problems May 5, 2023
View reviewed changes
apps/files_versions/lib/Versions/LegacyVersionsBackend.php
$owner = $storage->getOwner('');
$user = $this->userManager->get($owner);

$userFolder = $this->rootFolder->getUserFolder($user->getUID());

Check notice

Code scanning / Psalm

PossiblyNullReference

Cannot call method getUID on possibly null value
apps/files_versions/lib/Versions/LegacyVersionsBackend.php
$user = $this->userManager->get($owner);

$userFolder = $this->rootFolder->getUserFolder($user->getUID());
$nodes = $userFolder->getById($file->getId());

Check notice

Code scanning / Psalm

PossiblyNullArgument

Argument 1 of OCP\Files\Folder::getById cannot be null, possibly null value provided
@blizzz blizzz mentioned this pull request May 16, 2023
Merged
@blizzz blizzz added the 3. to review Waiting for reviews label May 17, 2023
@blizzz
Copy link
Member

blizzz commented May 17, 2023

CI issues, moving to 25.0.8

@juliusknorr juliusknorr force-pushed the backport/36690/stable25 branch from 1507635 to cf75621 Compare June 7, 2023 11:33
@juliusknorr
Copy link
Member

juliusknorr commented Jun 7, 2023

@icewind1991 The remaining failure puzzles me. As far as my debugging goes it seems the mountpoint is properly setup in the test but when calling getFileById on the user folder it is not found. Any chance you could have a look if you have any clue?


There was 1 error:

1) OCA\Files_Versions\Tests\VersioningTest::testRestoreCrossStorage
Error: Call to a member function getPath() on null

/home/runner/work/server/server/apps/files_versions/lib/Versions/LegacyVersionsBackend.php:74
/home/runner/work/server/server/apps/files_versions/lib/Versions/VersionManager.php:92
/home/runner/work/server/server/apps/files_versions/tests/VersioningTest.php:794
/home/runner/work/server/server/apps/files_versions/tests/VersioningTest.php:652

@blizzz blizzz mentioned this pull request Jun 12, 2023
Merged
@blizzz
Copy link
Member

blizzz commented Jun 15, 2023

moving to 25.0.9

@icewind1991
Copy link
Member

icewind1991 commented Jul 6, 2023

The remaining failure puzzles me. As far as my debugging goes it seems the mountpoint is properly setup in the test but when calling getFileById on the user folder it is not found. Any chance you could have a look if you have any clue?

Mounts mounted directly in test cases through Filesystem::mount don't get added the user mount cache.

juliusknorr and others added 5 commits July 7, 2023 18:26
@juliusknorr @blizzz
fix: Make sure that rollback hook is triggered on all version backends
aaaf9c7 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr @blizzz
tests(files_versions): Tear down fs to clear mount cache before testing
2741810 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@icewind1991 @blizzz
don't re-get fileinfo for versioned file if it's not shared
6999842 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@juliusknorr @blizzz
fix: Check return type on rollback
5b77597 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@icewind1991 @blizzz
properly register test mount for user
92c7367 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@blizzz
style: satisfy code style checker
5121cca 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz blizzz force-pushed the backport/36690/stable25 branch from 93d59da to 5121cca Compare July 7, 2023 16:30
@blizzz
Copy link
Member

blizzz commented Jul 7, 2023

rebased, squashed, and a minor cs fix

@blizzz blizzz mentioned this pull request Jul 10, 2023
Merged
@blizzz blizzz merged commit a4b7bb7 into stable25 Jul 10, 2023
@blizzz blizzz deleted the backport/36690/stable25 branch July 10, 2023 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blizzz blizzz blizzz approved these changes

@artonge artonge artonge approved these changes

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

Assignees

@icewind1991 icewind1991

Labels

3. to review Waiting for reviews bug

Projects

None yet

Milestone

Nextcloud 25.0.9

Development

Successfully merging this pull request may close these issues.

5 participants

@blizzz @juliusknorr @icewind1991 @artonge @skjnldsv