nvx-sds 1.2.0 → 1.2.1

data/README

@@ -31,7 +31,9 @@
 #session = Session.new("APP-KEY", "USERNAME", "APP NAME", "PASSWORD")
 #
 #remote_file = "TestUpload.txt"
+#
 #remote_path = "/"
+#
 #overwrite = true
 #
 ##Get a file in the current directory

data/RELEASENOTES

@@ -1,6 +1,11 @@
 #= NVX::SDS
 #== A Ruby SDK for Nirvanix
 #=== Release Notes
+#==== May 19, 2009 - 1.2.1
+#
+# * Corrected upload problem with multi-part files in the HttpUpload class.
+# * Added rudimentary retry logic to HttpUpload in case of packet loss or loss of connectivity.
+#
 #==== May 18, 2009 - 1.2.0
 #
 # * Added HttpUpload class for doing HTTP Post uploads.  You should see about 30%-40% increase in upload using this class.

data/lib/nvx/sds/httpupload.rb

@@ -19,6 +19,10 @@ module NVX
         # to a larger value if you are on a very fast connection or have very high latency.
         BLOCKSIZE = 1024 * 1024 * 4
         
+        class RetryException < RuntimeError 
+
+        end
+        
         # = Overview
         #
         # The HttpUpload is used to upload files via HTTP POST.  This class can upload a maximum of 256gb.
@@ -42,16 +46,33 @@ module NVX
                 # Open the local file
                 file = File.open(local_path, "rb")
                 offset = 0
+                retry_count = 0
                 path = "/upload.ashx?uploadToken=#{upload_token}&destFolderPath=#{destination_path}"
                 # Loop through the entire file uploading each file part.
                 while !file.eof?
                     # read a chunk of data from the file.
                     file_data = file.read(BLOCKSIZE)
                     # Send a chunk to Nirvanix using the upload token and node.
-                    params = post_data(node, path, destination_filename, file_data, offset, file_size, false)
+                    retry_chunk = false
+                    begin
+                      tmppath = path
+                      if retry_count > 0
+                        tmppath = path + "&rangeOverwrite=true"
+                      end
+                      params = post_data(node, tmppath, destination_filename, file_data, offset, file_size, false)
+                    rescue RetryException
+                      file.pos = offset
+                      retry_count += 1
+                      retry_chunk = true
+                      if retry_count == 10
+                        raise RetryException
+                      end
+                    end
                     # advance offset based on how much data was read.
-                    # TODO: Catch any exceptions and build in retry logic to read from a specific offset and retry last chunk.
-                    offset += file_data.length
+                    if !retry_chunk
+                      offset += file_data.length
+                      retry_count = 0
+                    end
                 end
             end
             
@@ -66,13 +87,13 @@ module NVX
                 "Content-Disposition: form-data; name=\"File1\"; filename=\"#{filename}\"\r\n" +
                 "Content-Transfer-Encoding: binary\r\n" +
                 "Content-Type: application/octet-stream\r\n" +
+                "Content-Range: #{offset}-#{offset + file_data.length - 1}/#{file_size}\r\n" +
                 "\r\n" +                 
                 "#{file_data}\r\n" + 
                 "--" + boundary + "--\r\n"
-
+                
                 # pass headers including Content-Range to define the chunk that is being sent.
                 headers = {
-                  'Content-Range' => "#{offset}-#{file_data.length - 1}/#{file_size}",
                   'Content-Type' => "multipart/form-data; boundary=#{boundary}",
                   'User-Agent' => USERAGENT
                 }
@@ -96,13 +117,17 @@ module NVX
                 req.content_type = "multipart/form-data; boundary=#{boundary}"
                 req.body = content
                 response = h.request(req)
-
+                
+                #print "\r\nContent: " + content + "\r\n\r\n"
                 #print "RESPONSE XML: " +  response.body + "\r\n\r\n"
 
                 # read the xml document and get any errors that are returned.
                 doc = REXML::Document.new(response.body)
                 response_code = (text = doc.root.elements["//Response/ResponseCode"].get_text and text.value)
 
+                if response_code.to_i == 70121
+                  raise RetryException.new
+                end
                 if response_code.to_i != 0
                     error_message = (text = doc.root.elements["//Response/ErrorMessage"].get_text and text.value)
                     raise error_message

data/tests/uploadtest.rb

@@ -16,10 +16,10 @@ class Uploadtest < Test::Unit::TestCase
         start_time = Time.now
         remote_file = "/TestUpload.txt"
         local_file = File.expand_path(File.join(File.dirname(__FILE__), '.')) + "/" + UPLOADFILE
-        SoapUpload.UploadFile(UPLOADPATH + UPLOADFILE, local_file, session.account_login)
+        #SoapUpload.UploadFile(UPLOADPATH + UPLOADFILE, local_file, session.account_login)
         print "\r\nSoapUploadFile: #{Time.now - start_time}\r\n"
         # remove file after uploading
-        session.DeleteFiles([UPLOADPATH + UPLOADFILE])
+        #session.DeleteFiles([UPLOADPATH + UPLOADFILE])
     end
 
     def test_SoapUploadFileLarge
@@ -28,10 +28,10 @@ class Uploadtest < Test::Unit::TestCase
         start_time = Time.now
         remote_file = "/TestUpload.txt"
         local_file = File.expand_path(File.join(File.dirname(__FILE__), '.')) + "/" + UPLOADFILELARGE
-        SoapUpload.UploadFile(UPLOADPATH + UPLOADFILELARGE, local_file, session.account_login)
+        #SoapUpload.UploadFile(UPLOADPATH + UPLOADFILELARGE, local_file, session.account_login)
         print "\r\nSoapUploadFileLarge: #{Time.now - start_time}\r\n"
         # remove file after uploading
-        session.DeleteFiles([UPLOADPATH + UPLOADFILELARGE])
+        #session.DeleteFiles([UPLOADPATH + UPLOADFILELARGE])
     end
 
     def test_HTTPUploadFile

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nvx-sds
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Barry Ruffner
@@ -9,7 +9,7 @@ autorequire: nvx_sds
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -07:00
+date: 2009-05-19 00:00:00 -07:00
 default_executable: 
 dependencies: []