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

[12] Fix s3 download and touch #7186

Merged
merged 2 commits into from Nov 17, 2017

Conversation

Projects
None yet
4 participants
@icewind1991
Member

icewind1991 commented Nov 15, 2017

Backport of #7113

icewind1991 added some commits Nov 8, 2017

Fix contructing headers for s3 download
Signed-off-by: Robin Appelman <robin@icewind.nl>
Use non empty files for object store touch
Signed-off-by: Robin Appelman <robin@icewind.nl>

@icewind1991 icewind1991 added this to the Nextcloud 12.0.4 milestone Nov 15, 2017

@icewind1991 icewind1991 requested review from MorrisJobke and schiessle Nov 15, 2017

@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Nov 15, 2017

Codecov Report

Merging #7186 into stable12 will increase coverage by <.01%.
The diff coverage is 100%.

@@              Coverage Diff               @@
##             stable12    #7186      +/-   ##
==============================================
+ Coverage       53.76%   53.77%   +<.01%     
- Complexity      22587    22589       +2     
==============================================
  Files            1384     1384              
  Lines           86660    86664       +4     
  Branches         1329     1329              
==============================================
+ Hits            46592    46600       +8     
+ Misses          40068    40064       -4
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/ObjectStore/S3ObjectTrait.php 57.89% <100%> (+3.17%) 13 <0> (+2) ⬆️
...b/private/Files/ObjectStore/ObjectStoreStorage.php 68.75% <100%> (+2.08%) 74 <0> (ø) ⬇️
apps/files_trashbin/lib/Expiration.php 90.32% <0%> (-1.62%) 29% <0%> (ø)
lib/private/Files/Cache/Propagator.php 94.93% <0%> (-1.27%) 16% <0%> (ø)
apps/files_trashbin/lib/Trashbin.php 72.53% <0%> (+0.24%) 136% <0%> (ø) ⬇️

codecov bot commented Nov 15, 2017

Codecov Report

Merging #7186 into stable12 will increase coverage by <.01%.
The diff coverage is 100%.

@@              Coverage Diff               @@
##             stable12    #7186      +/-   ##
==============================================
+ Coverage       53.76%   53.77%   +<.01%     
- Complexity      22587    22589       +2     
==============================================
  Files            1384     1384              
  Lines           86660    86664       +4     
  Branches         1329     1329              
==============================================
+ Hits            46592    46600       +8     
+ Misses          40068    40064       -4
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/ObjectStore/S3ObjectTrait.php 57.89% <100%> (+3.17%) 13 <0> (+2) ⬆️
...b/private/Files/ObjectStore/ObjectStoreStorage.php 68.75% <100%> (+2.08%) 74 <0> (ø) ⬇️
apps/files_trashbin/lib/Expiration.php 90.32% <0%> (-1.62%) 29% <0%> (ø)
lib/private/Files/Cache/Propagator.php 94.93% <0%> (-1.27%) 16% <0%> (ø)
apps/files_trashbin/lib/Trashbin.php 72.53% <0%> (+0.24%) 136% <0%> (ø) ⬇️
@schiessle

I still get the same warning in preview generation but otherwise it works... Will open a separate issue for it.

@@ -364,7 +364,7 @@ public function touch($path, $mtime = null) {
$fileId = $this->getCache()->put($path, $stat);
try {
//read an empty file from memory

This comment has been minimized.

@nickvergessen

nickvergessen Nov 17, 2017

Member

invalid

@nickvergessen

nickvergessen Nov 17, 2017

Member

invalid

This comment has been minimized.

@schiessle

schiessle Nov 17, 2017

Member

right, can we agree to merge this one and then I fix the comment here: #7206 ? Then we have it fixed in master and stable12 in one run.

@schiessle

schiessle Nov 17, 2017

Member

right, can we agree to merge this one and then I fix the comment here: #7206 ? Then we have it fixed in master and stable12 in one run.

This comment has been minimized.

@nickvergessen

nickvergessen Nov 17, 2017

Member

fine by me

@nickvergessen

nickvergessen Nov 17, 2017

Member

fine by me

@rullzer

🐘

@schiessle schiessle merged commit 031bde5 into stable12 Nov 17, 2017

3 checks passed

codecov/patch 100% of diff hit (target 53.76%)
Details
codecov/project 53.77% (+<.01%) compared to 2d8d248
Details
continuous-integration/drone/pr the build was successful
Details

@MorrisJobke MorrisJobke deleted the s3-download-stream-fix-12 branch Nov 17, 2017

@MorrisJobke MorrisJobke referenced this pull request Nov 20, 2017

Merged

12.0.4 RC #7225

1 of 1 task complete

@MorrisJobke MorrisJobke referenced this pull request Dec 19, 2017

Merged

[12] Update aws sdk + s3 improvements #6737

0 of 1 task complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment