mogilefs-client 3.5.0 → 3.6.0

data/GIT-VERSION-GEN

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

data/lib/mogilefs/backend.rb

@@ -138,12 +138,17 @@ class MogileFS::Backend
   end
 
   def dispatch_unlocked(request, timeout = @timeout) # :nodoc:
+    tries = nil
     begin
       io = socket
       io.timed_write(request, timeout)
       io
-    rescue SystemCallError, MogileFS::RequestTruncatedError  => err
-      @dead[@active_host] = [ Time.now, err ]
+    rescue SystemCallError, MogileFS::RequestTruncatedError => err
+      tries ||= Hash.new { |hash,host| hash[host] = 0 }
+      nr = tries[@active_host] += 1
+      if nr >= 2
+        @dead[@active_host] = [ Time.now, err ]
+      end
       shutdown_unlocked
       retry
     end

data/lib/mogilefs/mogilefs.rb

@@ -205,7 +205,7 @@ class MogileFS::MogileFS < MogileFS::Client
     if Hash === args[0]
       args = args[0]
       opts[:noverify] = args[:noverify]
-      opts[:zone] = args[:zone]
+      zone = args[:zone] and opts[:zone] = zone
       pathcount = args[:pathcount] and opts[:pathcount] = pathcount.to_i
     end
 

data/lib/mogilefs/mysql.rb

@@ -82,7 +82,7 @@ class MogileFS::Mysql
   # Get the paths for +key+.
   def _get_paths(params = {})
     zone = params[:zone]
-    noverify = (params[:noverify] == 1) # TODO this is unused atm
+    # noverify = (params[:noverify] == 1) # TODO this is unused atm
     dmid = get_dmid(params[:domain])
     devices = refresh_device or raise MogileFS::Backend::NoDevicesError
     urls = []

data/lib/mogilefs/version.rb

@@ -1 +1 @@
-MogileFS::VERSION = '3.5.0'
+MogileFS::VERSION = '3.6.0'

data/test/fresh.rb

@@ -39,8 +39,7 @@ EOF
 
     @trackers = @hosts = [ "#@test_host:#@tracker_port" ]
     @tracker.close
-    x!("mogilefsd", "--daemon", "--config=#{@mogilefsd_conf.path}")
-    wait_for_port @tracker_port
+    start_tracker
     @admin = MogileFS::Admin.new(:hosts => @hosts)
     50.times do
       break if File.size(@mogstored_pid.path) > 0
@@ -48,6 +47,11 @@ EOF
     end
   end
 
+  def start_tracker
+    x!("mogilefsd", "--daemon", "--config=#{@mogilefsd_conf.path}")
+    wait_for_port @tracker_port
+  end
+
   def wait_for_port(port)
     tries = 50
     begin

data/test/test_fresh.rb

@@ -147,4 +147,54 @@ class TestMogFresh < Test::Unit::TestCase
     end
     src.close!
   end
+
+  def test_new_file_copy_stream_known_length
+    add_host_device_domain
+    opts = { :content_length => 666 }
+    input = StringIO.new("short")
+    client = MogileFS::MogileFS.new :hosts => @hosts, :domain => @domain
+    assert_raises(MogileFS::SizeMismatchError) do
+      client.new_file("copy_stream", opts) do |io|
+        IO.copy_stream(input, io)
+      end
+    end
+
+    assert_raises(MogileFS::SizeMismatchError) do
+      client.new_file("copy_stream", opts) do |io|
+        IO.copy_stream(input, io, 666)
+      end
+    end
+  end if IO.respond_to?(:copy_stream)
+
+  def test_single_tracker_restart
+    add_host_device_domain
+    client = MogileFS::MogileFS.new :hosts => @hosts, :domain => @domain
+
+    data = "data"
+    client.store_content("key", "default", data)
+    listing = client.list_keys
+    assert_instance_of Array, listing
+
+    # restart the tracker
+    s = TCPSocket.new(@test_host, @tracker_port)
+    s.write "!shutdown\r\n"
+    s.flush # just in case, MRI (at least) syncs by default
+    assert_nil s.gets
+
+    start_tracker
+
+    # transparent retry
+    listing2 = client.list_keys
+    assert_instance_of Array, listing2
+    assert_equal listing, listing2
+    assert_equal([['key'], 'key'], listing)
+
+    # kill the tracker
+    s = TCPSocket.new(@test_host, @tracker_port)
+    s.write "!shutdown\r\n"
+    s.flush # just in case, MRI (at least) syncs by default
+    assert_nil s.gets
+    @mogilefsd_pid = nil
+    assert_raises(MogileFS::UnreachableBackendError) { client.list_keys }
+  end
 end

metadata

@@ -1,66 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mogilefs-client
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 3.6.0
   prerelease: 
-  segments: 
-  - 3
-  - 5
-  - 0
-  version: 3.5.0
 platform: ruby
-authors: 
+authors:
 - Eric Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.5'
   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
-  library allows any Ruby application to read, write and delete files in a
-  MogileFS instance.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.5'
+description: ! '["A MogileFS client library for Ruby.  MogileFS is an open source\ndistributed
+  filesystem, see: http://mogilefs.org for more details.  This\nlibrary allows any
+  Ruby application to read, write and delete files in a\nMogileFS instance."]'
+email:
 - normalperson@yhbt.net
-executables: 
+executables:
 - mog
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
-files: 
+files:
 - .document
 - .gitignore
 - .wrongdoc.yml
@@ -132,39 +125,31 @@ files:
 - .gemtest
 homepage: http://bogomips.org/mogilefs-client/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: seattlerb
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: MogileFS client library for Ruby
-test_files: 
+test_files:
 - test/test_http_reader.rb
 - test/test_mogilefs_integration_list_keys.rb
 - test/test_db_backend.rb
@@ -182,3 +167,4 @@ test_files:
 - test/test_bigfile.rb
 - test/test_mogilefs_integration_large_pipe.rb
 - test/test_mogstored_rack.rb
+- test/socket_test.rb