tyrantmanager 1.0.9 → 1.1.0

data/{HISTORY → HISTORY.rdoc}

@@ -1,4 +1,10 @@
 = Changelog
+== Version 1.1.0 2009-08-10
+
+* change 'status' command to 'process-status'
+* add 'replication-status' command
+* fix gem dependencies
+
 == Version 1.0.9 2009-08-01
 
 * First public versioned release

data/{README → README.rdoc}

@@ -1,9 +1,10 @@
 == Tyrant Manager
 
-* Homepage[http://copiousfreetime.rubyforge.org/tokyo-manager]
+* Homepage[http://copiousfreetime.rubyforge.org/tyrantmanager]
 * {Rubyforge project}[http://rubyforge.org/projects/copiousfreetime/]
 * email jeremy at copiousfreetime dot org
-* git clone git://github.com/copiousfreetime/tokyo-manager.git
+* github[http://github.com/copiousfreetime/tyrantmanager]
+* git clone git://github.com/copiousfreetime/tyrantmanager.git
 
 == INSTALLATION
 
@@ -15,7 +16,10 @@
 
 == DESCRIPTION
 
-A command line tool for managing Tokyo Tyrant instances.
+A command line tool for managing Tokyo Tyrant instances.  It allows for the
+creation, starting, stopping, listing, stating of many tokyo tyrant instances
+all on the same machine.  The commands can be applied to a single or multiple
+instances. 
 
 === Setup a manager home
 
@@ -252,7 +256,7 @@ You can also look at the server statistics of each running instance
 
 == CREDITS
 
-* Inspired by the {Light Cloud}[http://opensource.plurk.com/LightCloud/Tyrant_manager/} tyrant manager
+* Inspired by the {Light Cloud}[http://opensource.plurk.com/LightCloud/Tyrant_manager/] tyrant manager
 * {Tokyo Tyrant}[http://tokyocabinet.sourceforge.net/tyrantdoc/]
 
 == LICENSE

data/gemspec.rb

@@ -20,10 +20,12 @@ TyrantManager::GEM_SPEC = Gem::Specification.new do |spec|
   spec.executables  = pkg.files.bin.collect { |b| File.basename(b) }
 
   # add dependencies here
-  # spec.add_dependency("rake", ">= 0.8.1")
   spec.add_dependency( "loquacious", "~> 1.3.0")
   spec.add_dependency( "rufus-tokyo", "~> 1.0.0")
-  
+  spec.add_dependency( "logging", "~> 1.1.4" )
+  spec.add_dependency( "main", "~> 2.8.4" )
+
+  # development dependencies
   spec.add_development_dependency("configuration", ">= 0.0.5")
   spec.add_development_dependency( "rake", "~> 0.8.3")
 

data/lib/tyrant_manager/cli.rb

@@ -70,15 +70,22 @@ class TyrantManager
       run { Cli.run_command_with_params( 'stop', params ) }
     }
 
+    mode('replication-status') {
+      description "Describe the replication status of those servers using replication"
+      mixin :option_home
+      mixin :option_log_level
+      mixin :argument_instances
+      run { Cli.run_command_with_params( 'replication-status', params ) }
+    }
 
-    mode('status') {
+    mode('process-status') {
       description "Check the running status of all the tyrants listed"
       mixin :option_home
       mixin :option_log_level
 
       mixin :argument_instances
 
-      run { Cli.run_command_with_params( 'status', params ) }
+      run { Cli.run_command_with_params( 'process-status', params ) }
     }
 
     mode( 'stats' ) {

data/lib/tyrant_manager/command.rb

@@ -116,3 +116,4 @@ require 'tyrant_manager/commands/stop'
 require 'tyrant_manager/commands/status'
 require 'tyrant_manager/commands/stats'
 require 'tyrant_manager/commands/list'
+require 'tyrant_manager/commands/replication_status'

data/lib/tyrant_manager/commands/replication_status.rb

@@ -0,0 +1,92 @@
+require 'tyrant_manager/command'
+require 'socket'
+
+class TyrantManager
+  module Commands
+    #
+    # Report on the replication status of the server(s)
+    #
+    class ReplicationStatus< Command
+      def self.command_name
+        'replication-status'
+      end
+
+      def run
+        manager.each_instance do |instance|
+          ilist = options['instances']
+          if ilist  == %w[ all ] or ilist.include?( instance.name ) then
+            if instance.running? and instance.is_slave? then
+              s_stat = instance.stat
+              logger.info "#{instance.name} is replicating from #{s_stat['mhost']}:#{s_stat['mport']}"
+              if m_conn = validate_master_connection( instance ) then
+                if validate_master_master( instance.connection, m_conn ) then
+                  m_stat = m_conn.stat
+                  m_name = "#{s_stat['mhost']}:#{s_stat['mport']}"
+
+                  primary, failover = instance.connection, m_conn
+
+                  if m_stat['delay'] > s_stat['delay'] then
+                    primary, failover = m_conn, instance.connection
+                  end
+
+                  p_stat = primary.stat
+                  p_name = "#{ip_of( primary.host )}:#{primary.port}"
+
+                  f_stat = failover.stat
+                  f_name = "#{ip_of( failover.host )}:#{failover.port}"
+
+                  n_width = [ p_name.length, f_name.length ].max
+
+                  logger.info "  Primary master  : #{p_name} -> #{p_stat['rnum']} records, primary since #{(Time.now - ( Float(primary.stat['delay']))).strftime("%Y-%m-%d %H:%M:%S")}"
+                  logger.info "  Failover master : #{f_name} -> #{f_stat['rnum']} records, last replicated #{failover.stat['delay']} seconds ago"
+                end
+              end
+              logger.info ""
+            end
+          end
+        end
+      end
+
+      private
+
+      def validate_master_master( slave, master )
+        m_stat = master.stat
+        s_stat = slave.stat
+
+        if ( m_stat['mhost'] and m_stat['mport'] ) then
+          logger.info "  #{s_stat['mhost']}:#{s_stat['mport']} is replicating from #{m_stat['mhost']}:#{m_stat['mport']}"
+          mm_ip = ip_of( m_stat['mhost'] )
+          s_ip = ip_of( slave.host )
+          if ( s_ip == mm_ip ) and ( slave.port == m_stat['mport'].to_i ) then
+            #logger.info "    - this is a good master-master relationship"
+            return true 
+          else
+            logger.error "  Unsupported replication configuration!!!"
+            logger.error "  (original hostnames) #{slave.host}:#{slave.port} -> #{(master.host)}:#{master.port} -> #{m_stat['mhost']}:#{m_stat['mport']}"
+            logger.error "  (hostnames resolved) #{s_ip}:#{slave.port} -> #{ip_of(master.host)}:#{master.port} -> #{ip_of(m_stat['mhost'])}:#{m_stat['mport']}"
+            return false
+          end
+        end
+      end
+
+      def ip_of( hostname )
+        hostname = Socket.gethostname if %w[ localhost 0.0.0.0 ].include?( hostname )
+        addr_info = Socket.getaddrinfo( hostname, 1978, "AF_INET" )
+        return addr_info.first[3]
+      end
+
+      def validate_master_connection( slave ) 
+        begin
+          m_conn = slave.master_connection
+          m_stat = m_conn.stat
+          return m_conn
+        rescue => e
+          logger.error e
+          s_stat = slave.stat
+          logger.error "Master server #{s_stat["mhost"]}:#{s_stat['mport']} appears to be down."
+        end
+        return nil
+      end
+    end
+  end
+end

data/lib/tyrant_manager/commands/stats.rb

@@ -10,8 +10,7 @@ class TyrantManager
           ilist = options['instances']
           if ilist  == %w[ all ] or ilist.include?( instance.name ) then
             puts "Instance #{instance.name} at #{instance.home_dir}"
-            conn = instance.connection
-            stats = conn.stat
+            stats = instance.stat
             stats.keys.sort.each do |k|
               lhs = k.ljust(10, ".")
               puts "    #{lhs} #{stats[k]}"

data/lib/tyrant_manager/commands/status.rb

@@ -4,7 +4,11 @@ class TyrantManager
     #
     # Report the status of one ore more tyrant intances
     #
-    class Status < Command
+    class ProcessStatus < Command
+      def self.command_name
+        'process-status'
+      end
+
       def run
         manager.each_instance do |instance|
           ilist = options['instances']

data/lib/tyrant_manager/tyrant_instance.rb

@@ -308,13 +308,46 @@ class TyrantManager
       end
     end
 
+    #
+    # return the stats for this instance
+    #
+    def stat
+      connection.stat
+    end
+
     #
     # return a network connection to this instance
     #
     def connection
+      host = configuration.host
+
+      # you cannot connect to 0.0.0.0
+      if host == "0.0.0.0" then
+        host = "localhost"
+      end
       Rufus::Tokyo::Tyrant.new( configuration.host, configuration.port.to_i )
     end
 
+    #
+    # Is this instance a slave of another server?  This means it could be in a
+    # master-slave or master-master relationship
+    #
+    def is_slave?
+      s = connection.stat
+      return (s['mhost'] and s['mport'])
+    end
+
+    #
+    # return a network connection to the master server of this instance
+    #
+    def master_connection
+      if is_slave? then
+        s = self.stat
+        return Rufus::Tokyo::Tyrant.new( s['mhost'], s['mport'].to_i )
+      end
+      return nil
+    end
+
  
     private
 

data/lib/tyrant_manager/version.rb

@@ -6,8 +6,8 @@
 class TyrantManager
   module Version
     MAJOR   = 1
-    MINOR   = 0
-    BUILD   = 9
+    MINOR   = 1
+    BUILD   = 0
 
     def to_a 
       [MAJOR, MINOR, BUILD]

data/spec/tyrant_instance_spec.rb

@@ -51,6 +51,29 @@ describe TyrantManager::TyrantInstance  do
     @tyrant.data_dir.should == File.join( @tdir, "instances", "test", "data" )
   end
 
+  describe "against running instances" do
+    before( :each ) do
+      @tyrant.start
+      start = Time.now
+      loop do
+        break if @tyrant.running?
+        sleep 0.1
+        break if (Time.now - start) > 2
+      end
+    end
+
+    after( :each ) do
+      @tyrant.stop
+    end
+
+    it "#is_slave?" do
+      @tyrant.running?.should == true
+      @tyrant.should_not be_is_slave
+      @tyrant.stop
+    end
+
+  end
+
 
   describe "database types" do
     { 'memory-hash' => "*",

data/tasks/config.rb

@@ -12,11 +12,11 @@ Configuration.for('project') {
   author        "Jeremy Hinegardner"
   email         "jeremy@copiousfreetime.org"
   homepage      "http://copiousfreetime.rubyforge.org/tyrantmanager/"
-  description   Utils.section_of("README", "description")
+  description   Utils.section_of("README.rdoc", "description")
   summary       description.split(".").first
-  history       "HISTORY"
+  history       "HISTORY.rdoc"
   license       FileList["LICENSE"]
-  readme        "README"
+  readme        "README.rdoc"
 }
 
 #-----------------------------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tyrantmanager
 version: !ruby/object:Gem::Version 
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-01 00:00:00 -06:00
+date: 2009-08-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: logging
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: main
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.8.4
+    version: 
 - !ruby/object:Gem::Dependency 
   name: configuration
   type: :development
@@ -52,20 +72,21 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.8.3
     version: 
-description: A command line tool for managing Tokyo Tyrant instances.
+description: A command line tool for managing Tokyo Tyrant instances.  It allows for the creation, starting, stopping, listing, stating of many tokyo tyrant instances all on the same machine.  The commands can be applied to a single or multiple instances.
 email: jeremy@copiousfreetime.org
 executables: 
 - tyrantmanager
 extensions: []
 
 extra_rdoc_files: 
-- README
-- HISTORY
+- README.rdoc
+- HISTORY.rdoc
 - LICENSE
 - lib/tyrant_manager/cli.rb
 - lib/tyrant_manager/command.rb
 - lib/tyrant_manager/commands/create_instance.rb
 - lib/tyrant_manager/commands/list.rb
+- lib/tyrant_manager/commands/replication_status.rb
 - lib/tyrant_manager/commands/start.rb
 - lib/tyrant_manager/commands/stats.rb
 - lib/tyrant_manager/commands/status.rb
@@ -83,6 +104,7 @@ files:
 - lib/tyrant_manager/command.rb
 - lib/tyrant_manager/commands/create_instance.rb
 - lib/tyrant_manager/commands/list.rb
+- lib/tyrant_manager/commands/replication_status.rb
 - lib/tyrant_manager/commands/start.rb
 - lib/tyrant_manager/commands/stats.rb
 - lib/tyrant_manager/commands/status.rb
@@ -102,8 +124,8 @@ files:
 - spec/version_spec.rb
 - data/config.rb
 - data/default_instance_config.rb
-- README
-- HISTORY
+- README.rdoc
+- HISTORY.rdoc
 - LICENSE
 - tasks/announce.rake
 - tasks/distribution.rake
@@ -118,7 +140,7 @@ homepage: http://tyrant-manager.rubyforge.org/
 post_install_message: 
 rdoc_options: 
 - --main
-- README
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement