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

Fix reading empty files from objectstorage #22651

Merged
merged 1 commit into from
Sep 9, 2020
Merged

Conversation

rullzer
Copy link
Member

@rullzer rullzer commented Sep 7, 2020

Since we try to do range requests this will fail hard.
However since empty files are not that interesting to read anyways we
just read from an emptry memory stream.

Signed-off-by: Roeland Jago Douma [email protected]

@rullzer rullzer added bug 3. to review Waiting for reviews labels Sep 7, 2020
@rullzer rullzer added this to the Nextcloud 20 milestone Sep 7, 2020
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

🙈

@rullzer rullzer mentioned this pull request Sep 8, 2020
13 tasks
Since we try to do range requests this will fail hard.
However since empty files are not that interesting to read anyways we
just read from an emptry memory stream.

Signed-off-by: Roeland Jago Douma <[email protected]>
@faily-bot
Copy link

faily-bot bot commented Sep 9, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 32902: failure

mariadb10.1-php7.2

Show full log
There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There was 1 failure:

1) OCA\DAV\Tests\unit\CardDAV\CardDavBackendTest::testSearch with data set #0 ('John', array('FN'), array(), array(array('uri0', 'John Doe'), array('uri1', 'John M. Doe')))
Failed asserting that 1 is identical to 2.

/drone/src/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php:746

@rullzer rullzer merged commit e7f0348 into master Sep 9, 2020
@rullzer rullzer deleted the fix/s3/empty_files branch September 9, 2020 19:44
@rullzer
Copy link
Member Author

rullzer commented Sep 9, 2020

/backport to stable19

@rullzer
Copy link
Member Author

rullzer commented Sep 9, 2020

/backport to stable18

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 bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants