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 s3 large file download #33599

Merged
merged 2 commits into from
May 31, 2016

Conversation

lomeroe
Copy link
Contributor

@lomeroe lomeroe commented May 27, 2016

What does this PR do?

Change s3 downloads/uploads to use pyrequests streaming. Allows for uploading/downloading files larger than the amount of memory in the system.

What issues does this PR fix or reference?

#32916

Previous Behavior

on downloads: response from server was read into memory before being written to file
on uploads: file was read into memory before uploading

New Behavior

on upload: data is streamed off disk to s3
on download: data is streamed down to disk from s3. if return_bin=True, streaming is NOT used

Tests written?

No

…anged)

allows downloading files larger than amount of memory (non-stream reads into memory before writing to disk or uploading)
@cachedout cachedout merged commit 962bdc8 into saltstack:develop May 31, 2016
@jfindlay
Copy link
Contributor

jfindlay commented Jun 1, 2016

@rallytime, do you think this could be backported to 2015.8?

@rallytime
Copy link
Contributor

Sure - See #33681.

@rallytime rallytime added the ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. label Jun 1, 2016
lomeroe added a commit to lomeroe/salt that referenced this pull request Jun 1, 2016
@lomeroe
Copy link
Contributor Author

lomeroe commented Jun 1, 2016

@rallytime thanks...I submitted #33682 to backport to 2016.3 as well

cachedout pushed a commit that referenced this pull request Jun 1, 2016
rallytime pushed a commit that referenced this pull request Jun 2, 2016
lomeroe added a commit to lomeroe/salt that referenced this pull request Jun 22, 2016
rallytime pushed a commit that referenced this pull request Jun 22, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Jun 23, 2016
* upstream/develop: (37 commits)
  Use ipaddress to validate ipv4/ipv6 (saltstack#33956)
  Updated winrepo_test (saltstack#34227)
  Whitespace fix for saltstack#34235 (saltstack#34250)
  message_format was not set in the correct function (saltstack#34235)
  Typo in dockerio doc (saltstack#34244)
  Fixup test failure
  Pass through update_holds to pkg.install
  fix regression from saltstack#33681 which causes pulling a list of s3 objects via s3.query to fail (saltstack#34208)
  fix regression in s3.query from saltstack#33599 that causes pulling a file list from s3 to fail (saltstack#34207)
  utils/parsers.py: disable minion multiprocessing logging if only running one process
  Fix a pair of gitfs bugs (saltstack#34218)
  rsync state: Removed source existance check saltstack#25251
  Linted saltstack#34200
  Allow specifying memory, cpu and vcpu as kwargs for OpenNebula (saltstack#34203)
  Fixes saltstack#34181 no more newlines in long yaml encodes
  Clarify pkg.list_repo_pkgs docstring for held packages (saltstack#34188)
  Update saltutil.wheel docs to specify remote vs local minion behavior
  fix regression in s3.query from saltstack#33682
  Change target for dockerng assuming default status to Nitrogen release (saltstack#34206)
  Correct the docstrings formatting in pkgbuild modules and state (saltstack#34194)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants