Skip to content
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

touch opertation on object storage, don't create the file cache entry to early #7206

Merged
merged 1 commit into from
Nov 17, 2017

Conversation

schiessle
Copy link
Member

only create the file cache entry after the empty file was created successfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists.

fix #7203

@codecov
Copy link

codecov bot commented Nov 17, 2017

Codecov Report

Merging #7206 into master will decrease coverage by <.01%.
The diff coverage is 80%.

@@             Coverage Diff              @@
##             master    #7206      +/-   ##
============================================
- Coverage     50.84%   50.83%   -0.01%     
  Complexity    24545    24545              
============================================
  Files          1585     1585              
  Lines         93797    93796       -1     
  Branches       1354     1354              
============================================
- Hits          47688    47682       -6     
- Misses        46109    46114       +5
Impacted Files Coverage Δ Complexity Δ
...b/private/Files/ObjectStore/ObjectStoreStorage.php 66.94% <80%> (-1.81%) 74 <0> (ø)
apps/files_trashbin/lib/Expiration.php 90.32% <0%> (-1.62%) 29% <0%> (ø)

Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐘

…cessfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
@schiessle
Copy link
Member Author

@nickvergessen I fixed here the comment you mentioned in the other PR

@schiessle
Copy link
Member Author

here is the backport: #7207

@schiessle schiessle added this to the Nextcloud 13 milestone Nov 17, 2017
@schiessle schiessle merged commit 19e4a33 into master Nov 17, 2017
@schiessle schiessle deleted the fix-object-storage-touch branch November 17, 2017 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Warning on preview generation with object storage as primary storage
4 participants