taps 0.2.21 → 0.2.22

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 21
+:patch: 22
 :major: 0
 :minor: 2

data/lib/taps/utils.rb

@@ -81,10 +81,12 @@ module Utils
 			yield chunksize
 		rescue Errno::EPIPE, RestClient::RequestFailed
 			retries += 1
-			raise if retries > 1
+			raise if retries > 2
+
 			# we got disconnected, the chunksize could be too large
-			# so we're resetting to a very small value
-			chunksize = 10
+			# on first retry change to 10, on successive retries go down to 1
+			chunksize = (retries == 1) ? 10 : 1
+
 			retry
 		end
 
@@ -92,7 +94,7 @@ module Utils
 
 		diff = t2 - t1
 		new_chunksize = if retries > 0
-			(chunksize / 3).ceil
+			chunksize
 		elsif diff > 3.0
 			(chunksize / 3).ceil
 		elsif diff > 1.1
@@ -102,7 +104,7 @@ module Utils
 		else
 			chunksize + 100
 		end
-		new_chunksize = 10 if new_chunksize < 10
+		new_chunksize = 1 if new_chunksize < 1
 		new_chunksize
 	end
 

data/spec/utils_spec.rb

@@ -48,6 +48,10 @@ describe Taps::Utils do
 		Taps::Utils.calculate_chunksize(1000) { |c| raise Errno::EPIPE if c == 1000; c.should == 10 }.should == 10
 	end
 
+	it "will reset the chunksize to a small value if we got a broken pipe exception a second time" do
+		Taps::Utils.calculate_chunksize(1000) { |c| raise Errno::EPIPE if c == 1000 || c == 10; c.should == 1 }.should == 1
+	end
+
 	it "returns a list of columns that are text fields if the database is mysql" do
 		@db = mock("db")
 		@db.class.stubs(:to_s).returns("Sequel::MySQL::Database")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taps
 version: !ruby/object:Gem::Version 
-  version: 0.2.21
+  version: 0.2.22
 platform: ruby
 authors: 
 - Ricardo Chimal, Jr.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -08:00
+date: 2009-11-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency