mogilefs-client 3.2.0 → 3.3.0.rc1

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 CONSTANT = "MogileFS::VERSION"
 RVF = "lib/mogilefs/version.rb"
-DEF_VER = "v3.2.0"
+DEF_VER = "v3.3.0-rc1"
 vn = DEF_VER
 
 # First see if there is a version file (included in release tarballs),

data/HACKING

@@ -31,3 +31,7 @@
 * Tests may be run in parallel using GNU make:
 
   make -j6 test
+
+* Generate a pre-release gem for distribution/testing:
+
+  rake gem

data/Rakefile

@@ -7,10 +7,18 @@ $:.unshift 'lib'
 require 'mogilefs'
 Hoe.plugin :seattlerb
 
-if ! File.exist?("ChangeLog") || ! File.exist?("NEWS")
-  system("wrongdoc all")
+wd = %w(ChangeLog NEWS)
+wd_ok = true
+wd.each do |f|
+  next if File.exist?(f) || system("wrongdoc all")
+  wd_ok = false
+  File.open(f, "a") do |fp|
+    fp.puts "`wrongdoc all' failed, #{f} not generated properly"
+  end
 end
 
+warn "install `wrongdoc' gem to generate: #{wd.inspect}" unless wd_ok
+
 manifest = "Manifest.txt"
 if ! File.exist?(manifest) ||
    File.stat(manifest).mtime < File.stat(RVF).mtime ||
@@ -30,7 +38,7 @@ Hoe.spec 'mogilefs-client' do
   # developer 'drbrain@segment7.net', 'Eric Hodel'
   self.readme_file = "README"
   self.history_file = "NEWS"
-  self.url = "http://bogomips.org/mogilefs-client"
+  self.urls = %w(http://bogomips.org/mogilefs-client/)
   self.description = self.paragraphs_of("README", 1)
   self.summary = "MogileFS client library for Ruby"
 end

data/lib/mogilefs/backend.rb

@@ -232,6 +232,7 @@ class MogileFS::Backend
     no_raise = args.delete(:ruby_no_raise)
     request = make_request(cmd, args)
     line = nil
+    failed = false
     @mutex.synchronize do
       begin
         io = dispatch_unlocked(request)
@@ -245,11 +246,15 @@ class MogileFS::Backend
           raise EOFError, "end of file reached after: #{request.inspect}"
         # fall through to retry in loop
       rescue SystemCallError,
-             MogileFS::UnreadableSocketError,
-             MogileFS::InvalidResponseError, # truncated response
-             MogileFS::Timeout
+             MogileFS::InvalidResponseError # truncated response
         # we got a successful timed_write, but not a timed_gets
-        retry if idempotent
+        if idempotent
+          failed = true
+          shutdown_unlocked(false)
+          retry
+        end
+        shutdown_unlocked(true)
+      rescue MogileFS::UnreadableSocketError, MogileFS::Timeout
         shutdown_unlocked(true)
       rescue
         # we DO NOT want the response we timed out waiting for, to crop up later
@@ -257,6 +262,7 @@ class MogileFS::Backend
         # close the socket if there's any error.
         shutdown_unlocked(true)
       end while idempotent
+      shutdown_unlocked if failed
     end # @mutex.synchronize
     parse_response(line, no_raise ? request : nil)
   end

data/lib/mogilefs/http_file.rb

@@ -105,7 +105,13 @@ class MogileFS::HTTPFile < StringIO
       if @big_io.respond_to?(:stat)
         stat = @big_io.stat
       elsif String === @big_io || @big_io.respond_to?(:to_path)
-        file = File.open(@big_io)
+        begin
+          file = File.open(@big_io)
+        rescue => e
+          msg = "Failed to open input (#{@big_io.inspect}): " \
+                "#{e.message} (#{e.class})"
+          raise NonRetryableError, msg, e.backtrace
+        end
         stat = file.stat
       elsif @big_io.respond_to?(:size)
         size = @big_io.size

data/test/test_mogilefs.rb

@@ -605,6 +605,64 @@ class TestMogileFS__MogileFS < TestMogileFS
     assert_equal received[0], received[1]
   end
 
+  def test_idempotent_command_slow
+    ip = "127.0.0.1"
+    a = TCPServer.new(ip, 0)
+    hosts = [ "#{ip}:#{a.addr[1]}" ]
+    q = Queue.new
+    timeout = 1
+    args = { :hosts => hosts, :domain => "foo", :timeout => timeout }
+    c = MogileFS::MogileFS.new(args)
+    received = []
+    secs = timeout + 1
+    th = Thread.new do
+      close_later = []
+      x = a.accept
+      close_later << x
+      line = x.gets
+      %r{key=(\w+)} =~ line
+
+      sleep(secs) # cause the client to timeout:
+
+      begin
+        x.write("OK paths=1&path1=http://0/#{$1}\r\n")
+      rescue Errno::EPIPE
+        # EPIPE may or may not get raised due to timing issue,
+        # we don't care either way
+      rescue => e
+        flunk("#{e.message} (#{e.class})")
+      end
+      q << :continue_test
+
+      # client should start a new connection here
+      y = a.accept
+      close_later << y
+      line = y.gets
+      %r{key=(\w+)} =~ line
+      begin
+        y.write("OK paths=1&path1=http://0/#{$1}\r\n")
+      rescue => e
+        flunk("#{e.message} (#{e.class})")
+      end
+
+      # the client should've killed the old connection:
+      assert_raises(Errno::EPIPE) do
+        loop { x.write("OK paths=1&path1=http://0/#{$1}\r\n") }
+      end
+
+      close_later # main thread closes
+    end
+    assert_raises(MogileFS::UnreadableSocketError) do
+      c.get_paths("a")
+    end
+    assert_equal :continue_test, q.pop, "avoid race during test"
+    expect2 = %w(http://0/b)
+    assert_equal expect2, c.get_paths("b")
+    a.close
+    close_later = th.value
+    close_later.each { |io| assert_nil io.close }
+  end
+
   def test_idempotent_command_response_truncated
     ip = "127.0.0.1"
     a, b = TCPServer.new(ip, 0), TCPServer.new(ip, 0)

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: mogilefs-client
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  hash: 15424071
+  prerelease: 6
   segments: 
   - 3
-  - 2
+  - 3
   - 0
-  version: 3.2.0
+  - rc
+  - 1
+  version: 3.3.0.rc1
 platform: ruby
 authors: 
 - Eric Wong
@@ -15,23 +17,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-29 00:00:00 Z
+date: 2012-08-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
-        - 2
-        - 12
-        version: "2.12"
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id002
 description: |-
   A MogileFS client library for Ruby.  MogileFS is an open source
   distributed filesystem, see: http://mogilefs.org for more details.  This
@@ -114,7 +131,7 @@ files:
 - NEWS
 - lib/mogilefs/version.rb
 - .gemtest
-homepage: http://bogomips.org/mogilefs-client
+homepage: http://bogomips.org/mogilefs-client/
 licenses: []
 
 post_install_message: 
@@ -135,12 +152,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: seattlerb