royw-drbman 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/drbman.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{drbman}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roy Wright"]
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
      "lib/drbman/cli.rb",
      "lib/drbman/drb_pool.rb",
      "lib/drbman/drbman.rb",
+     "lib/drbman/errors.rb",
      "lib/drbman/host_machine.rb",
      "spec/drbman_spec.rb",
      "spec/host_machine_spec.rb",

data/examples/primes/spec/primes_spec.rb

@@ -31,5 +31,63 @@ describe('SieveOfEratosthenes') do
     sieve.execute.length.should == 303
   end
   
+  it 'should find 303 primes below 2000 for password host' do
+    env_ok.should be_true
+    @choices[:max_integer] = 2000
+    @choices[:hosts] = ["#{ENV['TEST_USER']}:#{ENV['TEST_PASSWORD']}@#{ENV['TEST_HOST']}"]
+    sieve = Primes.new(@logger, @choices)
+    sieve.execute.length.should == 303
+  end
+  
+  it 'should robustly fail for invalid password' do
+    env_ok.should be_true
+    @choices[:max_integer] = 2000
+    @choices[:hosts] = ["#{ENV['TEST_USER']}:badpassword@#{ENV['TEST_HOST']}"]
+    sieve = Primes.new(@logger, @choices)
+    sieve.execute.length.should == 0
+  end
+  
+  it 'should robustly fail for missing password' do
+    env_ok.should be_true
+    @choices[:max_integer] = 2000
+    @choices[:hosts] = ["#{ENV['TEST_USER']}@#{ENV['TEST_HOST']}"]
+    sieve = Primes.new(@logger, @choices)
+    sieve.execute.length.should == 0
+  end
+  
+  it 'should find 303 primes below 2000 for password host and localhost' do
+    env_ok.should be_true
+    @choices[:max_integer] = 2000
+    @choices[:hosts] = ["#{ENV['TEST_USER']}:#{ENV['TEST_PASSWORD']}@#{ENV['TEST_HOST']}", 'localhost']
+    sieve = Primes.new(@logger, @choices)
+    sieve.execute.length.should == 303
+  end
+  
+  it 'should find 303 primes below 2000 for invalid password host and localhost' do
+    env_ok.should be_true
+    @choices[:max_integer] = 2000
+    @choices[:hosts] = ["#{ENV['TEST_USER']}:badpassword@#{ENV['TEST_HOST']}", 'localhost']
+    sieve = Primes.new(@logger, @choices)
+    sieve.execute.length.should == 303
+  end
+  
+  it 'should find 303 primes below 2000 for missing password host and localhost' do
+    env_ok.should be_true
+    @choices[:max_integer] = 2000
+    @choices[:hosts] = ["#{ENV['TEST_USER']}@#{ENV['TEST_HOST']}", 'localhost']
+    sieve = Primes.new(@logger, @choices)
+    sieve.execute.length.should == 303
+  end
+  
 end
 
+def env_ok
+  result = !(ENV['TEST_HOST'].nil? || ENV['TEST_USER'].nil? || ENV['TEST_PASSWORD'].nil?)
+  unless result
+    puts
+    puts "You need to setup the following environment variables: TEST_HOST, TEST_USER, TEST_PASSWORD"
+    puts "Alternatively run spec like:  TEST_HOST='box' TEST_USER='who' TEST_PASSWORD='sekret' spec spec/primes_spec.rb"
+    puts
+  end
+  result
+end

data/lib/drbman.rb

@@ -3,7 +3,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require 'rubygems'
 
-# gem 'ruby-debug',       '>=0.10.3'
+gem 'ruby-debug',       '>=0.10.3'
 gem 'log4r',            '>=1.0.5'
 gem 'user-choices',     '>=1.1.6'
 gem 'extlib',           '>=0.9.12'
@@ -13,7 +13,7 @@ gem 'daemons',          '>=1.0.10'
 gem 'uuidtools',        '>=2.0.0'
 
 require 'extlib'
-# require 'ruby-debug'
+require 'ruby-debug'
 require 'log4r'
 require 'user-choices'
 require 'net/ssh'

data/lib/drbman/drb_pool.rb

@@ -19,11 +19,16 @@ class DrbPool
 
     threads = []
     mutex = Mutex.new
+    @logger.debug { "drb_pool hosts => #{hosts.inspect}"}
     hosts.each do |host_name, host_machine|
       threads << Thread.new(host_machine) do |host|
-        obj = get_drb_object(host.machine, host.port)
-        mutex.synchronize do
-          @objects << obj
+        if host.alive?
+          obj = get_drb_object(host.machine, host.port)
+          unless obj.nil?
+            mutex.synchronize do
+              @objects << obj
+            end
+          end
         end
       end
     end
@@ -40,6 +45,7 @@ class DrbPool
   # @example Usage
   #   pool.get_object {|obj| obj.do_something}
   def get_object(&block)
+    raise EmptyDrbPoolError.new("No drb servers available") if @objects.empty?
     mutex = Mutex.new
     while((object = next_object(mutex)).nil?)
       sleep 0.1 

data/lib/drbman/drbman.rb

@@ -51,7 +51,8 @@ class Drbman
     port = @user_choices[:port]
     @user_choices[:hosts].each do |host|
       host = "#{host}:#{port}" unless host =~ /\:\d+\s*$/
-      @hosts[host] = HostMachine.new(host, @logger, @user_choices)
+      host_machine = HostMachine.new(host, @logger, @user_choices)
+      @hosts[host] = host_machine if host_machine.alive?  # don't use off-line host machines
       port += 1
     end
     
@@ -60,6 +61,8 @@ class Drbman
         setup
         @pool = DrbPool.new(@hosts, @logger)
         block.call(self)
+      rescue EmptyDrbPoolError, EnvironmentError => e
+        @logger.error { e }
       rescue Exception => e
         @logger.error { e }
         @logger.debug { e.backtrace.join("\n") }
@@ -85,9 +88,11 @@ class Drbman
   def setup
     threads = []
     @hosts.each do |name, machine|
-      threads << Thread.new(machine) do |host_machine|
-        host_machine.session do |host|
-          startup(host)
+      if machine.alive?  # no need to thread if the machine is off-line
+        threads << Thread.new(machine) do |host_machine|
+          host_machine.session do |host|
+            startup(host)
+          end
         end
       end
     end
@@ -149,7 +154,7 @@ class Drbman
   def stop_drb_server(host)
     case host.sh("cd #{host.dir};ruby #{host.controller} stop")
     when /command not found/
-      raise Exception.new "Ruby is not installed on #{host.name}"
+      raise EnvironmentError.new "Ruby is not installed on #{host.name}"
     end
   end
   
@@ -160,7 +165,7 @@ class Drbman
     unless host.controller.blank?
       case host.sh("cd #{host.dir};ruby #{host.controller} start -- #{host.machine} #{host.port}")
       when /command not found/
-        raise Exception.new "Ruby is not installed on #{host.name}"
+        raise EnvironmentError.new "Ruby is not installed on #{host.name}"
       end
     end
   end
@@ -208,11 +213,11 @@ class Drbman
       when /false/i
         missing_gems << gem_name
       when /command not found/
-        raise Exception.new "Rubygems is not installed on #{host.name}"
+        raise EnvironmentError.new "Rubygems is not installed on #{host.name}"
       end
     end
     unless missing_gems.empty?
-      raise Exception.new "The following gems are not installed on #{host.name}: #{missing_gems.join(', ')}"
+      raise EnvironmentError.new "The following gems are not installed on #{host.name}: #{missing_gems.join(', ')}"
     end
   end
 

data/lib/drbman/errors.rb

@@ -0,0 +1,3 @@
+class EmptyDrbPoolError < Exception; end
+
+class EnvironmentError < Exception; end

data/lib/drbman/host_machine.rb

@@ -57,6 +57,21 @@ class HostMachine
     @logger.debug { self.pretty_inspect }
   end
   
+  def alive?
+    result = true
+    begin
+      session do |host|
+        response = host.sh('uptime')
+        @logger.debug { "#{host.name} #{response}" }
+        raise Exception.new('no response from uptime') if response.strip.empty?
+      end
+    rescue Exception => e
+      @logger.warn { "#{@name} is not responding: #{e}" }
+      result = false
+    end
+    result
+  end
+  
   # Connect to the host, execute the given block, then disconnect from the host
   # @yield [HostMachine]
   # @example
@@ -74,10 +89,7 @@ class HostMachine
       end
       yield self
     rescue Net::SSH::AuthenticationFailed => e
-      @logger.error { "Authentication Failed" }
-    rescue Exception => e
-      @logger.error { e }
-      @logger.error { e.backtrace.join("\n") }
+      @logger.error { "Authentication Failed for #{e}" }
       raise e
     ensure
       disconnect
@@ -165,14 +177,22 @@ class HostMachine
   # @see {#session}
   def connect
     if @ssh.nil?
-      options = @password.merge({
-        :timeout=>2, 
-        :auth_methods => %w(publickey hostbased password)
-        })
-      options = @password.merge({:verbose=>Logger::DEBUG}) if @choices[:ssh_debug]
+      options = @password
+      options = options.merge({:verbose => Logger::INFO}) if @choices[:ssh_debug]
+      options = options.merge({:password => ''}) if options[:password].nil?
       @logger.debug { "connect: @machine=>#{@machine}, @user=>#{@user}, options=>#{options.inspect}" }
-      @ssh = Net::SSH.start(@machine, @user, options)
-      # @ssh.forward.local(@port, @machine, @port)
+      begin
+        @ssh = Net::SSH.start(@machine, @user, options)
+        # @ssh.forward.local(@port, @machine, @port)
+      rescue Net::SSH::AuthenticationFailed
+        @logger.debug { "connect raised Net::SSH::AuthenticationFailed" }
+        @ssh = nil
+        raise Net::SSH::AuthenticationFailed.new(@name)
+      rescue Exception => e
+        @logger.debug { "connect raised #{e}"}
+        @ssh = nil
+        raise e
+      end
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: royw-drbman
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Roy Wright
@@ -108,6 +108,7 @@ files:
 - lib/drbman/cli.rb
 - lib/drbman/drb_pool.rb
 - lib/drbman/drbman.rb
+- lib/drbman/errors.rb
 - lib/drbman/host_machine.rb
 - spec/drbman_spec.rb
 - spec/host_machine_spec.rb