continuent-tools-core 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 066d8434e623f609bba0d8b314fb6fa388968013
-  data.tar.gz: a86daaa05f7ce16f95f050b34bc6a70c9d310eaf
+  metadata.gz: f43c9a9d090fbde883cdc8805505da41d06e63ef
+  data.tar.gz: 7fe7ba956951f4e6eb3704fdd946550efac0fc8c
 SHA512:
-  metadata.gz: ca7e9ca391f2b1d6be6981fdbe2b41816c9a3feda3b14fb8dd665ce0921be3e546fbeab34bbdb9f83183e97f2221e0f063b2e1cff93623fab8d0b5b820a386db
-  data.tar.gz: 29747f8be2ffed8945eeaacbd8906afe27fdee95fb4971470e4422d6011788820fd5ec064acfa01deca801041f4b470584405e849148e81bf13c460d6259104f
+  metadata.gz: 239f531642feb97d8512c03e09cf0628e8cc89b2bfd475825f8cddb96e3bf7c023d5d1c31f0388b16e165a20fcb5fa36a19c05172446164c1663d23bbd2fc119
+  data.tar.gz: 37f6e77d3e75cc0470ff79bacc1451668c87c9d86e96abcde3dcc34e83f01df978c308fe467432a8247109f577e18d3bfc5018c5986e68d12dd326d0cf4f7c13

data/bin/tungsten_directory

@@ -164,7 +164,7 @@ class TungstenDirectory
       entry["id"] = id
       entry["tags"].each{
         |k,v|
-        v = v.split(",")
+        v = v.to_s().split(",")
         if v.size() > 1
           entry["tags"][k] = v
         end

data/bin/tungsten_policy

@@ -31,18 +31,18 @@ class TungstenMigrateSchema
   
   def main
     if opt(:set) != nil
-      cmd = nil
-      case opt(:set).downcase()
-      when "maintenance"
-        cmd = "setmaintenance"
-      when "automatic"
-        cmd = "setautomatic"
-      when "manual"
-        cmd = "setmanual"
+      commands = []
+      if opt(:service).to_s() != ""
+        commands << "use #{opt(:service)}"
       end
+      commands << "set policy #{opt(:set)}"
       
-      mgr = TungstenDataserviceManager.new(TI.mgr_api_uri())
-      mgr.call(opt(:service), cmd)
+      cmd = "echo '#{commands.join(';')}' | #{TI.cctrl()}"
+      result = TU.cmd_result(cmd, true)
+      
+      unless result =~ /policy mode is now #{opt(:set).upcase()}/
+        raise MessageError.new("There was an error setting the policy")
+      end
     end
     
     status = TungstenStatus.new(TI, opt(:service))
@@ -69,6 +69,32 @@ class TungstenMigrateSchema
     unless TU.is_valid?()
       return TU.is_valid?()
     end
+    
+    if opt(:set) != nil
+      opt(:set, opt(:set).downcase())
+      case opt(:set)
+      when "maintenance"
+        # Do nothing
+      when "automatic"
+        # Do nothing
+      when "manual"
+        # Do nothing
+      else
+        TU.error("Unable to set policy to #{opt(:set)}")
+      end
+    end
+    
+    if TI.dataservices().size() > 1
+      if opt(:service).to_s() == ""
+        TU.error("The --service argument is required because multiple dataservices are availble.")
+      end
+    end
+    
+    if opt(:service) != nil
+      unless TI.dataservices().include?(opt(:service))
+        TU.error("The #{opt(:service)} dataservice is not valid")
+      end
+    end
   end
   
   def script_name

data/lib/ipparse/platforms/darwin.rb

@@ -0,0 +1,106 @@
+# VMware Continuent Tungsten Replicator
+# Copyright (C) 2015 VMware, Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Initial developer(s): Jeff Mace
+
+class DarwinIPParsePlatform < IPParsePlatform
+  def self.supports_platform?(platform)
+    if platform.downcase() =~ /darwin/
+      true
+    else
+      false
+    end
+  end
+  
+  def get_raw_ip_configuration
+    path = `which ifconfig 2>/dev/null`.chomp()
+    if path == ""
+      path = "/sbin/ifconfig"
+    end
+    
+    results = `export LANG=en_US; #{path} -a`
+    if results == false
+      raise "Unable to collect IP configuration from ifconfig"
+    else
+      return results
+    end
+  end
+  
+  def parse(raw)
+    name_regex = Regexp.compile(/^([a-zA-Z0-9]+):/)
+    ether_regex = Regexp.compile(/ether (a-f0-9:)*/)
+    flags_regex = Regexp.compile(/flags=([0-9]+)\<([A-Z,]+)\>/)
+    inet4_regex1 = Regexp.compile(/inet ([0-9\.]+)[ ]+netmask 0x([a-f0-9]{8})[ ]+(broadcast [0-9\.]+)?/)
+    inet6_regex1 = Regexp.compile(/inet6 ([a-f0-9:]+)%[a-z0-9]*[ ]*prefixlen ([0-9]+)/)
+    
+    all_interfaces = []
+    interface = []
+
+    raw.split("\n").each{
+      |line|
+      if name_regex.match(line)
+        if interface.size() > 0
+          all_interfaces << interface.join("\n")
+        end
+        interface = [line]
+      else
+        interface << line
+      end
+    }
+    if interface.size() > 0
+      all_interfaces << interface.join("\n")
+    end
+
+    all_interfaces.each{
+      |ifconfig|
+      include_interface = false
+      
+      begin
+        if ether_regex.match(ifconfig)
+          include_interface = true
+        end
+      rescue
+        # Catch the exception and move on
+      end
+      
+      if include_interface == false
+        next
+      end
+      
+      name = name_regex.match(ifconfig)[1]
+      if name == nil
+        raise "Unable to parse IP configuration because a valid name does not exist"
+      end
+      
+      m1 = inet4_regex1.match(ifconfig)
+      if m1
+        netmask = [
+          m1[2][0,2].to_i(16),
+          m1[2][2,2].to_i(16),
+          m1[2][4,2].to_i(16),
+          m1[2][6,2].to_i(16),
+          ]
+        add_ipv4(name, m1[1], netmask.join('.'))
+      end
+      
+      m1 = inet6_regex1.match(ifconfig)
+      if m1
+        add_ipv6(name, m1[1], m1[2])
+      end
+    }
+    
+    return @interfaces
+  end
+end

data/lib/tungsten/datasource.rb

@@ -5,6 +5,10 @@ class TungstenScriptDatasource
     @is_direct = is_direct
   end
   
+  def title
+    raise "Undefined function: #{self.class.name()}.title"
+  end
+  
   def can_manage_service?
     false
   end
@@ -26,7 +30,7 @@ class TungstenScriptDatasource
       return
     end
     
-    TU.notice("Stop the #{self.class.name()} service")
+    TU.notice("Stop the #{self.title()} service")
     _stop_server()
   end
   
@@ -47,7 +51,7 @@ class TungstenScriptDatasource
       return
     end
     
-    TU.notice("Start the #{self.class.name()} service")
+    TU.notice("Start the #{self.title()} service")
     _start_server()
   end
   
@@ -82,4 +86,70 @@ class TungstenScriptDatasource
   def sql_result(sql)
     @ti.sql_result(@service, sql, @is_direct)
   end
+  
+  def url
+    begin
+      TU.log_cmd_results?(false)
+      if @is_direct == true
+        return @ti.setting(@ti.setting_key(REPL_SERVICES, @service, "repl_direct_datasource_jdbcqueryurl"))
+      else
+        return @ti.setting(@ti.setting_key(REPL_SERVICES, @service, "repl_datasource_jdbcqueryurl"))
+      end
+    ensure
+      TU.log_cmd_results?(true)
+    end
+  end
+  
+  def host
+    begin
+      TU.log_cmd_results?(false)
+      if @is_direct == true
+        return @ti.setting(@ti.setting_key(REPL_SERVICES, @service, "repl_direct_datasource_host"))
+      else
+        return @ti.setting(@ti.setting_key(REPL_SERVICES, @service, "repl_datasource_host"))
+      end
+    ensure
+      TU.log_cmd_results?(true)
+    end
+  end
+  
+  def port
+    begin
+      TU.log_cmd_results?(false)
+      if @is_direct == true
+        return @ti.setting(@ti.setting_key(REPL_SERVICES, @service, "repl_direct_datasource_port"))
+      else
+        return @ti.setting(@ti.setting_key(REPL_SERVICES, @service, "repl_datasource_port"))
+      end
+    ensure
+      TU.log_cmd_results?(true)
+    end
+  end
+  
+  def user
+    begin
+      TU.log_cmd_results?(false)
+      if @is_direct == true
+        return @ti.setting(@ti.setting_key(REPL_SERVICES, @service, "repl_direct_datasource_user"))
+      else
+        return @ti.setting(@ti.setting_key(REPL_SERVICES, @service, "repl_datasource_user"))
+      end
+    ensure
+      TU.log_cmd_results?(true)
+    end
+  end
+  
+  def password
+    begin
+      # Disable logging of command results so the password doesn't end up in a log file
+      TU.log_cmd_results?(false)
+      if @is_direct == true
+        return @ti.setting(@ti.setting_key(REPL_SERVICES, @service, "repl_direct_datasource_password"))
+      else
+        return @ti.setting(@ti.setting_key(REPL_SERVICES, @service, "repl_datasource_password"))
+      end
+    ensure
+      TU.log_cmd_results?(true)
+    end
+  end
 end

data/lib/tungsten/datasources/mysql.rb

@@ -8,6 +8,10 @@ class TungstenScriptMySQLDatasource < TungstenScriptDatasource
     end
   end
   
+  def title
+    "MySQL"
+  end
+  
   def _stop_server
     begin
       pid_file = get_variable("pid_file")

data/lib/tungsten/exec.rb

@@ -445,46 +445,51 @@ class TungstenUtil
   end
   
   def is_localhost?(hostname)
-    if hostname == DEFAULTS
-      return false
-    end
-    
     @_is_localhost_cache ||= {}
     unless @_is_localhost_cache.has_key?(hostname)
       @_is_localhost_cache[hostname] = _is_localhost?(hostname)
     end
-    
+  
     return @_is_localhost_cache[hostname]
   end
   
   def _is_localhost?(hostname)
-    if hostname == hostname()
-      return true
-    end
-
-    ip_addresses = get_ip_addresses(hostname)
-    if ip_addresses == false
+    case hostname
+    when DEFAULTS
       return false
-    end
+    when hostname()
+      return true
+    when "localhost"
+      return true
+    when "127.0.0.1"
+      return true
+    when "::1"
+      return true
+    else
+      ip_addresses = get_ip_addresses(hostname)
+      if ip_addresses == false
+        return false
+      end
 
-    debug("Search ifconfig for #{ip_addresses.join(', ')}")
-    ipparsed = IPParse.new().get_interfaces()
-    ipparsed.each{
-      |iface, addresses|
+      debug("Search ifconfig for #{ip_addresses.join(', ')}")
+      ipparsed = IPParse.new().get_interfaces()
+      ipparsed.each{
+        |iface, addresses|
 
-      begin
-        # Do a string comparison so that we only match the address portion
-        addresses.each{
-          |type, details|
-          if ip_addresses.include?(details[:address])
-            return true
-          end
-        }
-      rescue ArgumentError
-      end
-    }
+        begin
+          # Do a string comparison so that we only match the address portion
+          addresses.each{
+            |type, details|
+            if ip_addresses.include?(details[:address])
+              return true
+            end
+          }
+        rescue ArgumentError
+        end
+      }
 
-    false
+      return false
+    end
   end
   
   def get_ip_addresses(hostname)

data/lib/tungsten/install.rb

@@ -381,22 +381,14 @@ class TungstenInstall
       raise "Unable to run SQL command for the #{service} dataservice. The datasource type does not support SQL commands."
     end
     
+    ds = datasource(service, use_direct_extractor)      
+    sql_results_from_url(sql, ds.url(), ds.user(), ds.password())
+  end
+  
+  def sql_results_from_url(sql, url, user, password)
     cfg = nil
     command = nil
     begin
-      # Disable logging of command results so the password doesn't end up in a log file
-      TU.log_cmd_results?(false)
-      if use_direct_extractor == true
-        url= setting(setting_key(REPL_SERVICES, service, "repl_direct_datasource_jdbcqueryurl"))
-        user = setting(setting_key(REPL_SERVICES, service, "repl_direct_datasource_user"))
-        password = setting(setting_key(REPL_SERVICES, service, "repl_direct_datasource_password"))
-      else
-        url = setting(setting_key(REPL_SERVICES, service, "repl_datasource_jdbcqueryurl"))
-        user = setting(setting_key(REPL_SERVICES, service, "repl_datasource_user"))
-        password = setting(setting_key(REPL_SERVICES, service, "repl_datasource_password"))
-      end
-      TU.log_cmd_results?(true)
-      
       cfg = Tempfile.new("cnf")
       cfg.puts("url=#{url}")
       cfg.puts("user=#{user}")
@@ -443,6 +435,16 @@ class TungstenInstall
   def sql_result(service, sql, use_direct_extractor = false)
     results = sql_results(service, sql, use_direct_extractor)
     
+    return_first_result(results)
+  end
+  
+  def sql_result_from_url(sql, url, user, password)
+    results = sql_results_from_url(sql, url, user, password)
+    
+    return_first_result(results)
+  end
+  
+  def return_first_result(results)
     if results.size() == 0
       raise "No results were returned by #{sql}"
     end

data/lib/tungsten/script.rb

@@ -53,6 +53,7 @@ module TungstenScript
     TU.debug("Begin #{$0} #{ARGV.join(' ')}")
     
     begin
+      prepare_environment()
       configure()
       @option_definitions.each{
         |option_key,definition|
@@ -134,6 +135,24 @@ module TungstenScript
     })
   end
   
+  def prepare_environment
+    target_umask = nil
+    if TI != nil
+      install_umask = TI.setting(TI.setting_key(HOSTS, "file_protection_umask"))
+      if install_umask.to_s() != ""
+        target_umask = install_umask.to_i(8)
+      end
+    else
+      library_mode = sprintf("%o", File.stat(File.dirname(__FILE__)).mode)
+      library_umask = 777 - library_mode[-3,3].to_i()
+      target_umask = sprintf("%04d", library_umask).to_i(8)
+    end
+    
+    if target_umask != nil
+      File.umask(target_umask)
+    end
+  end
+  
   def opt(option_key, value = nil)
     if value != nil
       @options[option_key] = value
@@ -614,7 +633,7 @@ module OfflineServicesScript
     })
     
     add_option(:offline, {
-      :on => "--offline String",
+      :on => "--offline [String]",
       :help => "Put required replication services offline before processing",
       :default => false,
       :parse => method(:parse_boolean_option_blank_is_true)
@@ -628,7 +647,7 @@ module OfflineServicesScript
     })
     
     add_option(:online, {
-      :on => "--online String",
+      :on => "--online [String]",
       :help => "Put required replication services online after successful processing",
       :default => false,
       :parse => method(:parse_boolean_option_blank_is_true)
@@ -690,7 +709,7 @@ module OfflineServicesScript
                   
                   begin
                     if use_manager == true
-                      get_manager_api.call("#{ds}/#{TI.hostname()}", 'shun')
+                      TU.cmd_result("echo 'datasource #{TI.hostname()} shun' | #{TI.cctrl()}")
                     end
                   
                     # The trepctl offline command is required even when using 
@@ -708,8 +727,20 @@ module OfflineServicesScript
             raise("The replication #{TU.pluralize(ds_list, "service", "services")} #{TU.pluralize(ds_list, "is", "are")} taking too long to go offline. Check the status for more information or use the --offline-timeout argument.")
           end
         end
+      end
+      
+      begin
+        clear_logs = opt(:clear_logs)
+        if clear_logs_during_prepare() == false
+          clear_logs = false
+        end
+        
+        if clear_logs == true
+          cleanup_services(false, clear_logs)
+        end
       rescue => e
         TU.exception(e)
+        code = 1
       end
     end
   end
@@ -717,10 +748,15 @@ module OfflineServicesScript
   def cleanup(code = 0)
     if initialized?() == true && TI != nil && code == 0
       begin
+        clear_logs = opt(:clear_logs)
+        if clear_logs_during_prepare() == true
+          clear_logs = false
+        end
+        
         if allow_service_state_change?() == true && @options[:online] == true
-          cleanup_services(true, @options[:clear_logs])
-        elsif @options[:clear_logs] == true
-          cleanup_services(false, @options[:clear_logs])
+          cleanup_services(true, clear_logs)
+        elsif clear_logs == true
+          cleanup_services(false, clear_logs)
         end
       rescue => e
         TU.exception(e)
@@ -840,6 +876,10 @@ module OfflineServicesScript
     
     @api
   end
+  
+  def clear_logs_during_prepare
+    false
+  end
 end
 
 # Only require a single replication service to be OFFLINE
@@ -975,7 +1015,7 @@ module MySQLServiceScript
   # Read the configured value for a mysql variable
   def get_mysql_option(opt)
     begin
-      val = TU.cmd_result("my_print_defaults --config-file=#{@options[:my_cnf]} mysqld | grep -e'^--#{opt.gsub(/[\-\_]/, "[-_]")}'")
+      val = TU.cmd_result("my_print_defaults --config-file=#{@options[:my_cnf]} mysqld | grep -e'^--#{opt.gsub(/[\-\_]/, "[-_]")}='")
     rescue CommandError => ce
       return nil
     end

data/lib/tungsten/util.rb

@@ -154,6 +154,17 @@ class TungstenUtil
     @log.puts(old_log.read())
   end
   
+  def limit_file_permissions(path)
+    if File.exists?(path)
+      # Get values like 0660 or 0700 for the log and umask
+      log_perms = sprintf("%o", File.stat(path).mode)[-4,4].to_i(8)
+      max_perms = sprintf("%04d", 777-sprintf("%o", File.umask()).to_i()).to_i(8)
+      # Calculate the target permissions for @log and set them
+      set_to_perms = log_perms & max_perms
+      File.chmod(sprintf("%o", set_to_perms).to_i(8), path)
+    end
+  end
+  
   def reset_errors
     @num_errors = 0
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: continuent-tools-core
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Continuent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -134,6 +134,7 @@ files:
 - lib/iniparse/lines.rb
 - lib/iniparse/parser.rb
 - lib/iniparse.rb
+- lib/ipparse/platforms/darwin.rb
 - lib/ipparse/platforms/linux.rb
 - lib/ipparse/README
 - lib/ipparse.rb