td 0.10.70 → 0.10.71

data/ChangeLog

@@ -1,3 +1,9 @@
+== 2013-02-05 version 0.10.71
+
+* bulk_import:upload_parts: improved retry algorithm to use exponential wait time
+* bulk_import:upload_parts: improved error messages
+
+
 == 2013-01-25 version 0.10.70
 
 * Add status to job subcommand, td job:status job_id

data/README.rdoc

@@ -33,7 +33,7 @@ You need to authorize the account, before executing any other commands.
 
 == Mac OS X
 
-Disable RVM and enable system ruby (/usr/bin/ruby) first.
+Disable RVM or rbenv and use system ruby (/usr/bin/ruby).
 And then run following commands:
 
     $ sudo gem install bundler

data/lib/td/command/bulk_import.rb

@@ -162,12 +162,20 @@ module Command
 
     unless errors.empty?
       $stderr.puts "failed to upload #{errors.size} files."
+      $stderr.puts "backtraces:"
       errors.each {|(ifname,ex)|
         $stderr.puts "  #{ifname}: #{ex}"
         ex.backtrace.each {|bt|
-          $stderr.puts "      #{ifname}: #{ex}"
+          $stderr.puts "      #{ifname}: #{bt}"
         }
       }
+      $stderr.puts "files:"
+      ifnames = errors.map {|(ifname,ex)| ifname }
+      ifnames.each {|ifname|
+        $stderr.puts "  #{ifname}"
+      }
+      $stderr.puts "You can retry uploading by following command:"
+      $stderr.puts "td bulk_import:upload_parts #{name} #{ifnames.map {|ifname| "'#{ifname}'" }.join(' ')}"
       exit 1
     end
 
@@ -495,14 +503,16 @@ module Command
 
   private
   def bulk_import_upload_impl(name, part_name, io, size, retry_limit, retry_wait)
+    retry_count = 0
     begin
       client = get_client
       client.bulk_import_upload_part(name, part_name, io, size)
     rescue
-      if retry_limit > 0
-        retry_limit -= 1
+      if retry_limit >= retry_count
+        retry_count += 1
         $stderr.write "#{$!}; retrying '#{part_name}'...\n"
-        sleep retry_wait
+        w = (retry_count ** 1.5) * retry_wait
+        sleep w
         retry
       end
       raise

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.70'
+VERSION = '0.10.71'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.70
+  version: 0.10.71
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -236,18 +236,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3004606412038514569
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3004606412038514569
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23