tyrantmanager 1.3.2 → 1.4.0

data/HISTORY.rdoc

@@ -1,4 +1,9 @@
 = Changelog
+== Version 1.4.0 2010-01-19
+
+* add 'archive-ulogs' command to allow for compression or removal of ulogs no
+  longer needed for replication
+
 == Version 1.3.2 2010-01-04
 
 * update logging and main dependencies

data/lib/tyrant_manager/cli.rb

@@ -109,6 +109,35 @@ class TyrantManager
       run { ::TyrantManager::Cli.run_command_with_params( 'list', params ) }
     }
 
+    mode( 'archive-ulogs' ) {
+      description "Archive the ulog files that are no longer necessary for replication"
+      mixin :option_home
+      mixin :option_log_level
+      mixin :argument_instances
+
+      option( 'archive-method' ) {
+        description "The method of archiving, compress, or delete.  Choosing 'delete' will also delete previously 'compressed' ulog files."
+        argument :required
+        validate { |m| %w[ compress delete ].include?( m.downcase ) }
+        default "compress"
+      }
+
+      option( 'dry-run' ) {
+        description "Do not archive, just show the commands"
+        default false
+      }
+
+      option( 'slaves' ) {
+        description "Comma separated list of slave instances connection strings host:port,host:port,..."
+        argument :required
+        cast :list_of_string
+      }
+
+      run { ::TyrantManager::Cli.run_command_with_params( 'archive-ulogs', params ) }
+
+    }
+
+
     #--- Mixins ---
     mixin :option_home do
       option( :home ) do

data/lib/tyrant_manager/command.rb

@@ -117,3 +117,4 @@ require 'tyrant_manager/commands/status'
 require 'tyrant_manager/commands/stats'
 require 'tyrant_manager/commands/list'
 require 'tyrant_manager/commands/replication_status'
+require 'tyrant_manager/commands/archive_ulogs'

data/lib/tyrant_manager/commands/archive_ulogs.rb

@@ -0,0 +1,156 @@
+require 'tyrant_manager/command'
+require 'socket'
+
+class TyrantManager
+  module Commands
+    #
+    # Archive ulog files that are no longer used for replication.
+    #
+    # You must give the list of slave connection strings on the commandline, or 
+    # if the server is in a single master-master relationship, then you can
+    # allow tyrantmanager to figure that out and do the right thing.
+    # 
+    # Give the slaves of a particular master
+    #
+    #   tyrantmanager archive-ulogs master1 --slaves slave1:11011,slave2:11012,slave3:11013 
+    #
+    # Or if there is a master-master relationship tyrant manager can figure it
+    # out.
+    #
+    #   tyrantmanager archive-ulogs master1
+    #
+    #
+    class ArchiveUlogs < Command
+      def self.command_name
+        'archive-ulogs'
+      end
+
+      def run
+        instance_slaves = determine_master_slave_mappings( options['slaves'] )
+
+        manager.each_instance( options['instances'] ) do |instance|
+          if instance.is_master_master? then
+            manager.logger.debug "#{instance.name} is master_master"
+            instance_slaves[instance.connection_string] << instance.master_connection
+          end
+          slave_connections = instance_slaves[instance.connection_string]
+
+          potential_removals = potential_ulog_archive_files( instance )
+          manager.logger.info "Checking #{slave_connections.size} slaves of #{instance.name}"
+
+          slave_connections.each do |conn|
+            potential_removals = trim_potential_removals( instance, potential_removals, conn )
+          end
+
+          archive_files_with_method( potential_removals.keys.sort, options['archive-method'] )
+
+        end
+      end
+
+      #
+      # Archive each of the files in the list with the given method
+      #
+      def archive_files_with_method( list, method )
+        list.each do |fname|
+          leader = (options['dry-run']) ? "(dry-run)" : ""
+          if "delete" == method then
+            File.unlink( fname ) unless options['dry-run']
+            manager.logger.info "deleted #{leader} #{fname}"
+          else
+            if File.extname( fname ) == ".ulog" then
+              %x[ gzip #{fname} ] unless options['dry-run']
+              manager.logger.info "#{leader} compressed #{fname}"
+            else
+              manager.logger.info "#{leader} already compressed #{fname}"
+            end
+          end
+        end
+      end
+
+      #
+      # Remove all items from the potential removals list that have a timestamp
+      # that is newer than the last replication timestamp of the tyrant
+      # connection
+      #
+      def trim_potential_removals( master_instance, potential, slave_conn )
+        slave_stat = slave_conn.stat
+        milliseconds = Float( slave_stat['rts'] )
+        last_replication_at = Time.at( milliseconds  / 1_000_000 )
+
+        manager.logger.debug "Slave #{slave_conn.host}:#{slave_conn.port} last replicated at #{last_replication_at.strftime("%Y-%m-%d %H:%M:%S")} from #{master_instance.connection_string}"
+
+        if milliseconds.to_i == 0 then
+          manager.logger.warn "It appears that the slave at #{slave_conn.host}:#{slave_conn.port} has never replicated"
+          manager.logger.warn "This means that no ulogs on the master will be removed, since there is no evidence of replication."
+          manager.logger.warn "It may be necessary to force a replication by inserting a record into the master:"
+          manager.logger.warn ""
+          manager.logger.warn "    tcrmgr put -port #{master_instance.configuration.port} #{master_instance.configuration.host} __tyrant_manager.force_replication_at #{Time.now.utc.to_i}"
+          manager.logger.warn ""
+          manager.logger.warn "And then removing that record if you so choose:"
+          manager.logger.warn ""
+          manager.logger.warn "    tcrmgr out -port #{master_instance.configuration.port} #{master_instance.configuration.host} __tyrant_manager.force_replication_at"
+          manager.logger.warn ""
+        end
+
+        manager.logger.debug "Trimming ulog files that are newer than #{last_replication_at.strftime("%Y-%m-%d %H:%M:%S")}"
+
+        trimmed_potential = remove_newer_than( potential, last_replication_at )
+      end
+
+      #
+      # Filter all the ulogs from the list whose value is greater than the input
+      # time.
+      #
+      def remove_newer_than( potential, whence )
+        potential.keys.sort.each do |fname|
+          if potential[fname] > whence then
+            potential.delete( fname )
+          end
+        end
+        return potential
+      end
+
+      #
+      # The list of potential files to remove from the ulog directory.  This is
+      # all the files in the ulog directory, minus the last one lexically.
+      #
+      # A hash of filename => File.mtime values is returned
+      #
+      def potential_ulog_archive_files( instance )
+        names = instance.ulog_files[0..-2]
+        names += Dir.glob( "#{instance.ulog_dir}/*.ulog.gz" )
+        potential = {}
+        names.each do |name|
+          potential[name] = File.mtime( name )
+        end
+        return potential
+      end
+
+      # Given a list of slaves, create a hash that has as the key, the instance
+      # connection string of a master, as as the value, an array of
+      # Rufus::Tokyo::Tyrant connections.
+      #
+      def determine_master_slave_mappings( list_of_slaves ) 
+        master_to_slaves = Hash.new{ |h,k| h[k] = [] }
+
+        list_of_slaves ||= []
+        list_of_slaves.each do |connection_string|
+          host, port = connection_string.split(":")
+          conn = Rufus::Tokyo::Tyrant.new( host, port.to_i )
+          stat = conn.stat
+          master_host = stat['mhost']
+          master_port = stat['mport']
+          if master_host and master_port then
+            master_to_slaves["#{master_host}:#{master_port}"] << conn
+          else
+            manager.logger.warn "Slave #{connection_string} does not have a master server configured, skipping using it as a slave"
+          end
+        end
+
+        return master_to_slaves
+      end
+    end
+  end
+end
+ 
+ 

data/lib/tyrant_manager/commands/list.rb

@@ -7,20 +7,17 @@ class TyrantManager
     #
     class List < Command
       def run
-        manager.each_instance do |instance|
-          ilist = options['instances']
-          if ilist  == %w[ all ] or ilist.include?( instance.name ) then
-            parts = []
-            parts << ("%20s" % instance.name)
-            parts << "port #{instance.configuration.port}"
-            parts << instance.home_dir
+        manager.each_instance( options['instances'] ) do |instance|
+          parts = []
+          parts << ("%20s" % instance.name)
+          parts << "port #{instance.configuration.port}"
+          parts << instance.home_dir
 
-            if instance.configuration.master_server then
-              parts << "server id #{"%2d" % instance.configuration.server_id}"
-              parts << "replicating from #{instance.configuration.master_server}:#{instance.configuration.master_port}"
-            end
-            puts parts.join(" : ")
+          if instance.configuration.master_server then
+            parts << "server id #{"%2d" % instance.configuration.server_id}"
+            parts << "replicating from #{instance.configuration.master_server}:#{instance.configuration.master_port}"
           end
+          puts parts.join(" : ")
         end
       end
     end

data/lib/tyrant_manager/commands/replication_status.rb

@@ -12,12 +12,10 @@ class TyrantManager
       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']}"
+        manager.each_instance( options['instances'] ) do |instance|
+          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
@@ -30,10 +28,10 @@ class TyrantManager
                   end
 
                   p_stat = primary.stat
-                  p_name = "#{ip_of( primary.host )}:#{primary.port}"
+                  p_name = "#{manager.ip_of( primary.host )}:#{primary.port}"
 
                   f_stat = failover.stat
-                  f_name = "#{ip_of( failover.host )}:#{failover.port}"
+                  f_name = "#{manager.ip_of( failover.host )}:#{failover.port}"
 
                   n_width = [ p_name.length, f_name.length ].max
 
@@ -41,8 +39,7 @@ class TyrantManager
                   logger.info "  Failover master : #{f_name} -> #{f_stat['rnum']} records, last replicated #{failover.stat['delay']} seconds ago"
                 end
               end
-              logger.info ""
-            end
+            logger.info ""
           end
         end
       end
@@ -55,26 +52,20 @@ class TyrantManager
 
         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 )
+          mm_ip = manager.ip_of( m_stat['mhost'] )
+          s_ip = manager.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']}"
+            logger.error "  (hostnames resolved) #{s_ip}:#{slave.port} -> #{manager.ip_of(master.host)}:#{master.port} -> #{manager.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

data/lib/tyrant_manager/commands/start.rb

@@ -6,24 +6,21 @@ class TyrantManager
     #
     class Start < Command
       def run
-        manager.each_instance do |instance|
-          ilist = options['instances']
-          if ilist  == %w[ all ] or ilist.include?( instance.name ) then
-            parts = [ "Starting #{instance.name}" ]
-            parts << instance.start_command
+        manager.each_instance( options['instances'] ) do |instance|
+          parts = [ "Starting #{instance.name}" ]
+          parts << instance.start_command
 
-            if options['dry-run'] then
-              parts << "(dry-run)"
-              logger.info parts.join(" : ")
+          if options['dry-run'] then
+            parts << "(dry-run)"
+            logger.info parts.join(" : ")
 
-            elsif not instance.running? then
-              logger.info parts.join(" : ")
-              Dir.chdir( instance.home_dir ) do
-                instance.start 
-              end
-            else
-              logger.info "Instance #{instance.name} already running"
+          elsif not instance.running? then
+            logger.info parts.join(" : ")
+            Dir.chdir( instance.home_dir ) do
+              instance.start 
             end
+          else
+            logger.info "Instance #{instance.name} already running"
           end
         end
       end

data/lib/tyrant_manager/commands/stats.rb

@@ -6,17 +6,15 @@ class TyrantManager
     #
     class Stats < Command
       def run
-        manager.each_instance do |instance|
-          ilist = options['instances']
-          if ilist  == %w[ all ] or ilist.include?( instance.name ) then
-            puts "Instance #{instance.name} at #{instance.home_dir}"
-            stats = instance.stat
-            stats.keys.sort.each do |k|
-              lhs = k.ljust(10, ".")
-              puts "    #{lhs} #{stats[k]}"
-            end
-            puts
+        manager.each_instance( options['instances'] ) do |instance|
+          puts "Instance #{instance.name} at #{instance.home_dir}"
+          stats = instance.stat
+          max_width = stats.keys.collect { |k| k.length }.sort.last + 2
+          stats.keys.sort.each do |k|
+            lhs = k.ljust(max_width, ".")
+            puts "    #{lhs} #{stats[k]}"
           end
+          puts
         end
       end
     end

data/lib/tyrant_manager/commands/status.rb

@@ -10,14 +10,11 @@ class TyrantManager
       end
 
       def run
-        manager.each_instance do |instance|
-          ilist = options['instances']
-          if ilist  == %w[ all ] or ilist.include?( instance.name ) then
-            if instance.running? then
-              logger.info "#{instance.name} is running as pid #{instance.pid}"
-            else
-              logger.info "#{instance.name} is not running, or its pid file is gone"
-            end
+        manager.each_instance( options['instances'] ) do |instance|
+          if instance.running? then
+            logger.info "#{instance.name} is running as pid #{instance.pid}"
+          else
+            logger.info "#{instance.name} is not running, or its pid file is gone"
           end
         end
       end

data/lib/tyrant_manager/commands/stop.rb

@@ -6,15 +6,12 @@ class TyrantManager
     #
     class Stop < Command
       def run
-        manager.each_instance do |instance|
-          ilist = options['instances']
-          if ilist  == %w[ all ] or ilist.include?( instance.name ) then
-            if File.exist?( instance.pid_file ) then
-              logger.info "Stopping #{instance.name} : pid #{instance.pid}"
-              instance.stop
-            else
-              logger.info "Stopping #{instance.name} : no pid file, nothing to do"
-            end
+        manager.each_instance( options['instances'] ) do |instance|
+          if File.exist?( instance.pid_file ) then
+            logger.info "Stopping #{instance.name} : pid #{instance.pid}"
+            instance.stop
+          else
+            logger.info "Stopping #{instance.name} : no pid file, nothing to do"
           end
         end
       end

data/lib/tyrant_manager/tyrant_instance.rb

@@ -152,6 +152,13 @@ class TyrantManager
       @ulog_dir ||= append_to_home_if_not_absolute( configuration.ulog_dir )
     end
 
+    #
+    # The list of .ulog files that are in the ulog/ directory
+    #
+    def ulog_files
+      Dir.glob( "#{ulog_dir}/*.ulog" ).sort
+    end
+
     #
     # The lua extension file
     #
@@ -369,13 +376,21 @@ class TyrantManager
       tclass.new( configuration.host, configuration.port.to_i )
     end
 
+    #
+    # Return the host:port connection string of the instance
+    #
+    def connection_string
+      "#{configuration.host}:#{configuration.port}"
+    end
+
     #
     # Is this instance a slave of another server?  This means it could be in a
-    # master-slave or master-master relationship
+    # master-slave or master-master relationship.  returns true or false
+    # explicitly
     #
     def is_slave?
       s = connection.stat
-      return (s['mhost'] and s['mport'])
+      return ((s['mhost'] and s['mport']) ? true : false )
     end
 
     #
@@ -389,6 +404,27 @@ class TyrantManager
       return nil
     end
 
+    #
+    # Is this instance in a master-master relationship with another server.
+    # This means that it is a slave, and its master server is also a slave of
+    # this server
+    #
+    def is_master_master?
+      if mc = self.master_connection then
+        mstat = mc.stat
+        mslave_host = manager.ip_of(mstat['mhost'])
+        mslave_port = mstat['mport']
+
+        mslave_conn_string = "#{mslave_host}:#{mslave_port}"
+
+        my_host = manager.ip_of( configuration.host )
+        my_conn_string = "#{my_host}:#{configuration.port}"
+        logger.debug "#is_master_master? -> my_conn_string = #{my_conn_string} mslave_conn_string = #{mslave_conn_string}"
+
+        return (my_conn_string == mslave_conn_string)
+      end
+      return false
+    end
  
     private
 

data/lib/tyrant_manager/util.rb

@@ -0,0 +1,9 @@
+class TyrantManager
+  module Util
+    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
+  end
+end

data/lib/tyrant_manager/version.rb

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

data/lib/tyrant_manager.rb

@@ -7,10 +7,12 @@ require 'rubygems'
 require 'loquacious'
 require 'tyrant_manager/version'
 require 'tyrant_manager/paths'
+require 'tyrant_manager/util'
 require 'tyrant_manager/log'
 
 class TyrantManager
   include TyrantManager::Paths
+  include TyrantManager::Util
 
   class Error < StandardError; end
 
@@ -135,6 +137,8 @@ class TyrantManager
       end
       return TyrantManager.new( dir )
     end
+
+
   end
 
   #
@@ -211,9 +215,17 @@ class TyrantManager
     return @instances
   end
 
-  def each_instance
+  # Yield each instance that exists in the limit list, if the limit exists.  
+  # If the limit does not exist then yield each instance.
+  #
+  def each_instance( limit = %w[ all ])
+    limit = [ limit ].flatten
+    every = (limit.first == "all")
+
     instances.keys.sort.each do |name|
-      yield instances[name]
+      if every or limit.include?( name ) then
+        yield instances[name]
+      end
     end
   end
 

data/spec/tyrant_instance_spec.rb

@@ -5,17 +5,44 @@ require 'tyrant_manager/tyrant_instance'
 
 describe TyrantManager::TyrantInstance  do
   before( :each ) do
-    @tdir = File.join( temp_dir, 'tyrant' )
+    @tyrant_manager_dir = File.join( temp_dir, 'tyrant' )
+
+    @instances = {
+        'standalone'       => nil,
+        'slave_1'          => nil,
+        'master_master_1'  => nil,
+        'master_master_2'  => nil 
+    }
+ 
     TyrantManager::Log.silent {
-      @mgr = TyrantManager.setup( @tdir )
-      @idir   = @mgr.instances_path( "test" )
-      @tyrant = TyrantManager::TyrantInstance.setup( @idir )
-      @tyrant.manager = @mgr
+
+      @mgr = TyrantManager.setup( @tyrant_manager_dir)
+
+      @instances.keys.each_with_index do |name, idx|
+         idir = @mgr.instances_path( name )
+         tyrant = TyrantManager::TyrantInstance.setup( idir )
+         tyrant.manager = @mgr
+         tyrant.configuration.port += idx
+         tyrant.configuration.server_id = tyrant.configuration.port
+         @instances[name] = tyrant
+       end
     }
+
+    # set the slave_1 to be a slave of the standalone
+    @instances['slave_1'].configuration.master_server = "localhost"
+    @instances['slave_1'].configuration.master_port   = @instances['standalone'].configuration.port
+
+    # set the master_master pairs into a master_master relationship
+    @instances['master_master_1'].configuration.master_server = "localhost"
+    @instances['master_master_1'].configuration.master_port   = @instances['master_master_2'].configuration.port
+
+    @instances['master_master_2'].configuration.master_server = "localhost"
+    @instances['master_master_2'].configuration.master_port   = @instances['master_master_1'].configuration.port
+
   end
 
   after( :each ) do
-    FileUtils.rm_rf @tdir
+    FileUtils.rm_rf @tyrant_manager_dir
   end
 
   it "raises an exception if given an invalid directory on initialization" do
@@ -23,55 +50,95 @@ describe TyrantManager::TyrantInstance  do
   end
 
   it "#config_file" do
-    @tyrant.config_file.should == File.join( @tdir, "instances", "test", "config.rb" )
-    File.exist?( @tyrant.config_file ).should == true
+    @instances['standalone'].config_file.should == File.join( @tyrant_manager_dir, "instances", "standalone", "config.rb" )
+    File.exist?( @instances['standalone'].config_file ).should == true
   end
 
   it "#configuration" do
-    @tyrant.configuration.should_not == nil
+    @instances['standalone'].configuration.should_not == nil
   end
 
   it "#pid_file" do
-    @tyrant.pid_file.should == File.join( @tdir, "instances", "test", "test.pid" )
+    @instances['standalone'].pid_file.should == File.join( @tyrant_manager_dir, "instances", "standalone", "standalone.pid" )
   end
 
   it "#log_file" do
-    @tyrant.log_file.should == File.join( @tdir, "instances", "test", "log", "test.log" )
+    @instances['standalone'].log_file.should == File.join( @tyrant_manager_dir, "instances", "standalone", "log", "standalone.log" )
   end
 
   it "#replication_timestamp_file" do
-    @tyrant.replication_timestamp_file.should == File.join( @tdir, "instances", "test", "test.rts" )
+    @instances['standalone'].replication_timestamp_file.should == File.join( @tyrant_manager_dir, "instances", "standalone", "standalone.rts" )
   end
 
   it "#lua_extension_file" do
-    @tyrant.lua_extension_file.should == File.join( @tdir, "instances", "test", "lua", "test.lua" )
+    @instances['standalone'].lua_extension_file.should == File.join( @tyrant_manager_dir, "instances", "standalone", "lua", "standalone.lua" )
   end
 
   it "#data_dir" do
-    @tyrant.data_dir.should == File.join( @tdir, "instances", "test", "data" )
+    @instances['standalone'].data_dir.should == File.join( @tyrant_manager_dir, "instances", "standalone", "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
+      @instances.each_pair do |name, instance|
+        instance.start
+        start = Time.now
+        #print "#{name} : starting ->"
+        loop do
+          break if instance.running?
+          #print "+"
+          $stdout.flush
+          sleep 0.1
+          break if (Time.now - start) > 3
+        end
+        #puts
       end
     end
 
     after( :each ) do
-      @tyrant.stop
+      @instances.each_pair do |name, instance|
+        instance.stop
+        start = Time.now
+        #print "#{name} : stopping ->"
+        loop do
+          break unless instance.running?
+          #print  "-"
+          $stdout.flush
+          sleep 0.1
+          break if (Time.now - start) > 3
+        end
+        #puts
+      end
+    end
+
+    it "#is_running?" do
+      @instances.each_pair do |name, instance|
+        [ name, instance.running? ].should == [ name, true ]
+      end
+    end
+
+    it "#is_slave? when it is NOT a slave" do
+      @instances['standalone'].running?.should == true
+      @instances['standalone'].is_slave?.should == false
+    end
+
+    it "#is_slave? when it IS a slave" do
+      @instances['slave_1'].running?.should == true
+      @instances['slave_1'].is_slave?.should == true
     end
 
-    it "#is_slave?" do
-      @tyrant.running?.should == true
-      @tyrant.should_not be_is_slave
-      @tyrant.stop
+    it "#is_master_master? when it is NOT in a master_master relationship" do
+      @instances['slave_1'].running?.should == true
+      @instances['slave_1'].is_master_master?.should == false
     end
 
+    it "#is_master_master? when it IS in a master_master relationship" do
+      @instances['master_master_1'].running?.should == true
+      @instances['master_master_1'].is_master_master?.should == true
+
+      @instances['master_master_2'].running?.should == true
+      @instances['master_master_2'].is_master_master?.should == true
+    end
   end
 
 
@@ -84,23 +151,23 @@ describe TyrantManager::TyrantInstance  do
       'table'       => "tct"
     }.each_pair do |db_type, db_ext|
       it "db_type of #{db_type} is db file with ext #{db_ext}" do
-        f = @tyrant.db_file( db_type )
+        f = @instances['standalone'].db_file( db_type )
         if f.size == 1 then
           f.should == db_ext
         else
-          f.should == File.join( @tdir, "instances", "test", "data", "test.#{db_ext}" )
+          f.should == File.join( @tyrant_manager_dir, "instances", "standalone", "data", "standalone.#{db_ext}" )
         end
       end
     end
   end
 
   it "#ulog_dir" do
-    @tyrant.ulog_dir.should == File.join( @tdir, "instances", "test", "ulog" )
+    @instances['standalone'].ulog_dir.should == File.join( @tyrant_manager_dir, "instances", "standalone", "ulog" )
   end
 
 
   it "#start_command" do
-    @tyrant.start_command.should =~ /^ttserver/
+    @instances['standalone'].start_command.should =~ /^ttserver/
   end
 
 end

data/spec/tyrant_manager_spec.rb

@@ -51,7 +51,7 @@ describe TyrantManager do
     @mgr.configuration.ttserver.should == "ttserver"
   end
 
-  it "knows all its instances" do
+  it "iterates over all its instances" do
     3.times do |x|
       idir   = @mgr.instances_path( "test#{x}" )
       TyrantManager::TyrantInstance.setup( idir )
@@ -66,4 +66,21 @@ describe TyrantManager do
 
     names.sort.should == %w[ test0 test1 test2 ]
   end
+
+  it "iterates over a subset of instances" do
+    3.times do |x|
+      idir   = @mgr.instances_path( "test#{x}" )
+      TyrantManager::TyrantInstance.setup( idir )
+    end
+
+    @mgr.instances.size.should == 3
+    names = []
+    @mgr.each_instance( %w[ test0 test2] ) do |i|
+      i.name.should =~ /test\d/
+      names << i.name
+    end
+
+    names.sort.should == %w[ test0 test2 ]
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tyrantmanager
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 -07:00
+date: 2010-01-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,7 @@ extra_rdoc_files:
 - LICENSE
 - lib/tyrant_manager/cli.rb
 - lib/tyrant_manager/command.rb
+- lib/tyrant_manager/commands/archive_ulogs.rb
 - lib/tyrant_manager/commands/create_instance.rb
 - lib/tyrant_manager/commands/list.rb
 - lib/tyrant_manager/commands/replication_status.rb
@@ -99,6 +100,7 @@ extra_rdoc_files:
 - lib/tyrant_manager/paths.rb
 - lib/tyrant_manager/runner.rb
 - lib/tyrant_manager/tyrant_instance.rb
+- lib/tyrant_manager/util.rb
 - lib/tyrant_manager/version.rb
 - lib/tyrant_manager.rb
 - lib/tyrantmanager.rb
@@ -106,6 +108,7 @@ files:
 - bin/tyrantmanager
 - lib/tyrant_manager/cli.rb
 - lib/tyrant_manager/command.rb
+- lib/tyrant_manager/commands/archive_ulogs.rb
 - lib/tyrant_manager/commands/create_instance.rb
 - lib/tyrant_manager/commands/list.rb
 - lib/tyrant_manager/commands/replication_status.rb
@@ -117,6 +120,7 @@ files:
 - lib/tyrant_manager/paths.rb
 - lib/tyrant_manager/runner.rb
 - lib/tyrant_manager/tyrant_instance.rb
+- lib/tyrant_manager/util.rb
 - lib/tyrant_manager/version.rb
 - lib/tyrant_manager.rb
 - lib/tyrantmanager.rb