shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-25 02:50:08 +03:00
Code Releases Wiki Activity

Feature #4217: Add support for READ_LENGTH

Browse Source
This commit is contained in:
Jaime Melis 2016-03-09 19:06:55 +01:00
parent 0f3dbf58db
commit f4f280ce68
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/market_mad/remotes/s3/import
View File

@ -68,14 +68,11 @@ region = xpath(xml, 'MARKETPLACE/TEMPLATE/REGION')
signature_version = xpath(xml, 'MARKETPLACE/TEMPLATE/SIGNATURE_VERSION')
endpoint = xpath(xml, 'MARKETPLACE/TEMPLATE/ENDPOINT')
force_path_style = xpath(xml, 'MARKETPLACE/TEMPLATE/FORCE_PATH_STYLE')
read_length = xpath(xml, 'MARKETPLACE/TEMPLATE/READx_LENGTH')
name = "marketapp-#{id}"
source = "s3://#{bucket}/#{name}"
# Upload
READ_LENGTH = 10*1024*1024 # Read in chunks of 10MB
s3_config = {
:region => region,
:access_key_id => access_key_id,
@ -86,6 +83,14 @@ s3_config[:signature_version] = signature_version if !signature_version.to_s.emp
s3_config[:endpoint] = endpoint if !endpoint.to_s.empty?
s3_config[:force_path_style] = true if force_path_style.to_s.downcase == "yes"
DEFAULT_READ_LENGTH = 32*1024*1024 # Read in chunks of 32MB
if read_length.to_s.empty?
read_length = DEFAULT_READ_LENGTH
else
read_length = 1024*1024*read_length.to_i
end
s3 = S3.new(s3_config)
s3.name = name
@ -99,7 +104,7 @@ end
cmd = "#{UTILS_PATH}/downloader.sh #{import_source} -"
Open3.popen3(cmd) do |_, o, _, _|
body = o.read(READ_LENGTH)
body = o.read(read_length)
if o.eof?
s3.put_object(body)
@ -110,7 +115,7 @@ Open3.popen3(cmd) do |_, o, _, _|
s3.upload_part(body)
until o.eof?
body = o.read(READ_LENGTH)
body = o.read(read_length)
s3.upload_part(body)
end