Skip to content

[stable9] Fix cross-storage move info when moving between two received shares#28284

Merged
PVince81 merged 6 commits into
stable9from
stable9-cross-storage-moveinfo
Jul 6, 2017
Merged

[stable9] Fix cross-storage move info when moving between two received shares#28284
PVince81 merged 6 commits into
stable9from
stable9-cross-storage-moveinfo

Conversation

@PVince81

@PVince81 PVince81 commented Jul 3, 2017

Copy link
Copy Markdown
Contributor

Backport of #28238 to stable9 which is based on #28022 and #27172.

This prevents the inconsistency to happen when moving between two received shares or moving something out of a received share. (tested manually)

@jvillafanez @tomneedham

@PVince81

PVince81 commented Jul 3, 2017

Copy link
Copy Markdown
Contributor Author

Oh no... the fileid changes after move 😢

    And User "user1" checks id of file "/folderB/ONE"                 # FeatureContext::userChecksFileIdForPath()
      Failed asserting that 626 matches expected 628.

@PVince81

PVince81 commented Jul 3, 2017

Copy link
Copy Markdown
Contributor Author

Added backport of b53d659.

Strangely the part from "apps/files_sharing/lib/cache.php" was completely missing.

@jvillafanez

Copy link
Copy Markdown
Member

👍

@PVince81 PVince81 force-pushed the stable9-cross-storage-moveinfo branch from 96ecfab to 099d6f9 Compare July 4, 2017 07:38
@PVince81

PVince81 commented Jul 4, 2017

Copy link
Copy Markdown
Contributor Author

rebased ⛏

@PVince81

PVince81 commented Jul 4, 2017

Copy link
Copy Markdown
Contributor Author

ran out of rebases for today 😢

Vincent Petry and others added 5 commits July 5, 2017 13:49
Need to properly resolve the given path to a source path in
`getMoveInfo`. This was missing when adding this new method.
The CacheWrapper will properly forward the call to the wrapped cache.
@PVince81 PVince81 force-pushed the stable9-cross-storage-moveinfo branch from 099d6f9 to 0086803 Compare July 5, 2017 11:50
@PVince81

PVince81 commented Jul 5, 2017

Copy link
Copy Markdown
Contributor Author

rebase ammo for stable9 reloaded: rebased 🔨

@PVince81

PVince81 commented Jul 5, 2017

Copy link
Copy Markdown
Contributor Author

uh oh

15:07:42 --- Failed scenarios:
15:07:42 
15:07:42     /var/lib/jenkins/workspace/owncloud-core_core_PR-28284-AGS7RI2Q7U4DEE7NBFVJ7LUSVDRCZC4GWYE7KBK24TDD7ACJYXZQ/build/integration/features/webdav-related.feature:390

I did run the integration tests before pushing...

@PVince81

PVince81 commented Jul 5, 2017

Copy link
Copy Markdown
Contributor Author

hmm, 0086803 was supposed to fix this:

[Wed Jul  5 15:16:09 2017] 127.0.0.1:38996 [207]: /remote.php/webdav/folderB/ONE
    And User "user1" checks id of file "/folderB/ONE"                 # FeatureContext::userChecksFileIdForPath()
      Failed asserting that 71 matches expected 73.

I clearly remember seeing it passing. But it was before I did the cherry pick. In my first attempt I didn't use that commit but simply picked the function out of another diff... hmm...

@PVince81

PVince81 commented Jul 5, 2017

Copy link
Copy Markdown
Contributor Author

Now I get it... in my first attempt I took the code directly from stable9.1, which is https://github.com/owncloud/core/blob/stable9.1/lib/private/Files/Cache/Wrapper/CacheJail.php#L311.

Then to be clean I looked at git blame to find the commit that added this there. Now if you look closely 0086803#diff-ae33233c15f58849fc5659b9b0157798R309 you can see that it's not 100% the same...

On stable9.1 there's an additional getSourcePath which is from another commit 00122c1

Going to cherry pick that one now...

@PVince81 PVince81 merged commit eb9bf10 into stable9 Jul 6, 2017
@PVince81 PVince81 deleted the stable9-cross-storage-moveinfo branch July 6, 2017 11:17
@lock

lock Bot commented Aug 3, 2019

Copy link
Copy Markdown

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.

@lock lock Bot locked as resolved and limited conversation to collaborators Aug 3, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants