murakumo 0.4.4 → 0.4.5

data/bin/murakumo-attach-ec2-attach-interface

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'optparse'
+
+require 'util/murakumo_ec2_attach_interface'
+
+access_key = nil
+secret_key = nil
+if_id = nil
+dev_idx = nil
+endpoint = nil
+instance_id = nil
+
+ARGV.options do |opt|
+  begin
+    opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key = v }
+    opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key = v }
+    opt.on('-n', '--network-if-id IF_ID') {|v| if_id = v }
+    opt.on('-d', '--device-index INDEX') {|v| dev_idx = v }
+    opt.on('-r', '--region REGION') {|v| endpoint = v }
+    opt.on('-i', '--instance-id INSTANCE_ID') {|v| instance_id = v }
+    opt.parse!
+
+    access_key ||= (ENV['AMAZON_ACCESS_KEY_ID'] || ENV['AWS_ACCESS_KEY_ID'])
+    secret_key ||= (ENV['AMAZON_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_ACCESS_KEY'])
+
+    unless access_key and secret_key and if_id
+      puts opt.help
+      exit 1
+    end
+  rescue => e
+    $stderr.puts e
+    exit 1
+  end
+end
+
+Murakumo::Util::ec2_attach_interface(access_key, secret_key, if_id, dev_idx, endpoint, instance_id)

data/bin/murakumo-show-ec2-instances

@@ -12,16 +12,21 @@ endpoint = nil
 instance_id = nil
 
 ARGV.options do |opt|
-  opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key = v }
-  opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key = v }
-  opt.on('-r', '--region REGION') {|v| endpoint = v }
-  opt.parse!
-
-  access_key ||= ENV['AMAZON_ACCESS_KEY_ID']
-  secret_key ||= ENV['AMAZON_SECRET_ACCESS_KEY']
-
-  unless access_key and secret_key
-    puts opt.help
+  begin
+    opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key = v }
+    opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key = v }
+    opt.on('-r', '--region REGION') {|v| endpoint = v }
+    opt.parse!
+
+    access_key ||= (ENV['AMAZON_ACCESS_KEY_ID'] || ENV['AWS_ACCESS_KEY_ID'])
+    secret_key ||= (ENV['AMAZON_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_ACCESS_KEY'])
+
+    unless access_key and secret_key
+      puts opt.help
+      exit 1
+    end
+  rescue => e
+    $stderr.puts e
     exit 1
   end
 end

data/bin/murakumo-show-ec2-interfaces

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'optparse'
+require 'yaml'
+
+require 'util/murakumo_ec2_interfaces'
+
+access_key = nil
+secret_key = nil
+endpoint = nil
+instance_id = nil
+
+ARGV.options do |opt|
+  begin
+    opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key = v }
+    opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key = v }
+    opt.on('-r', '--region REGION') {|v| endpoint = v }
+    opt.parse!
+
+    access_key ||= (ENV['AMAZON_ACCESS_KEY_ID'] || ENV['AWS_ACCESS_KEY_ID'])
+    secret_key ||= (ENV['AMAZON_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_ACCESS_KEY'])
+
+    unless access_key and secret_key
+      puts opt.help
+      exit 1
+    end
+  rescue => e
+    $stderr.puts e
+    exit 1
+  end
+end
+
+instances = Murakumo::Util::ec2_interfaces(access_key, secret_key, endpoint)
+
+puts YAML.dump(instances)

data/bin/murakumo-show-ec2-private-ip-addresses

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'optparse'
+
+require 'util/murakumo_ec2_private_ip_addresses'
+
+access_key = nil
+secret_key = nil
+endpoint = nil
+instance_id = nil
+
+ARGV.options do |opt|
+  begin
+    opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key = v }
+    opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key = v }
+    opt.on('-r', '--region REGION') {|v| endpoint = v }
+    opt.parse!
+
+    access_key ||= (ENV['AMAZON_ACCESS_KEY_ID'] || ENV['AWS_ACCESS_KEY_ID'])
+    secret_key ||= (ENV['AMAZON_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_ACCESS_KEY'])
+
+    unless access_key and secret_key
+      puts opt.help
+      exit 1
+    end
+  rescue => e
+    $stderr.puts e
+    exit 1
+  end
+end
+
+ip_addrs = Murakumo::Util::ec2_private_ip_addresses(access_key, secret_key, endpoint)
+
+ip_addrs.each do |i|
+  puts i.join("\t")
+end

data/bin/murakumo-show-ec2-tags

@@ -11,17 +11,22 @@ endpoint = nil
 instance_id = nil
 
 ARGV.options do |opt|
-  opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key = v }
-  opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key = v }
-  opt.on('-r', '--region REGION') {|v| endpoint = v }
-  opt.on('-i', '--instance-id INSTANCE_ID') {|v| instance_id = v }
-  opt.parse!
-
-  access_key ||= ENV['AMAZON_ACCESS_KEY_ID']
-  secret_key ||= ENV['AMAZON_SECRET_ACCESS_KEY']
-
-  unless access_key and secret_key
-    puts opt.help
+  begin
+    opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key = v }
+    opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key = v }
+    opt.on('-r', '--region REGION') {|v| endpoint = v }
+    opt.on('-i', '--instance-id INSTANCE_ID') {|v| instance_id = v }
+    opt.parse!
+
+    access_key ||= (ENV['AMAZON_ACCESS_KEY_ID'] || ENV['AWS_ACCESS_KEY_ID'])
+    secret_key ||= (ENV['AMAZON_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_ACCESS_KEY'])
+
+    unless access_key and secret_key
+      puts opt.help
+      exit 1
+    end
+  rescue => e
+    $stderr.puts e
     exit 1
   end
 end

data/etc/attach_if.sh.example

@@ -0,0 +1,12 @@
+#!/bin/sh
+AWS_ACCESS_KEY_ID=...
+AWS_SECRET_ACCESS_KEY=...
+REGION=ap-northeast-1
+IF_ID=eni-...
+
+/usr/bin/murakumo-attach-ec2-attach-interface \
+  -k "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" \
+  -r $REGION -n $IF_ID 2>&1 | logger
+
+exit 0
+

data/etc/murakumo-init.rb.for-ec2

@@ -1,19 +1,23 @@
-AMAZON_ACCESS_KEY_ID = '...'
-AMAZON_SECRET_ACCESS_KEY = '...'
+AWS_ACCESS_KEY_ID = '...'
+AWS_SECRET_ACCESS_KEY = '...'
+REGION = 'ap-northeast-1'
 
 # get self ip address
 ip_addr = Murakumo::Util.self_ip_address
 
 # get hostname
-tags = Murakumo::Util.ec2_tags(AMAZON_ACCESS_KEY_ID, AMAZON_SECRET_ACCESS_KEY)
+tags = Murakumo::Util.ec2_tags(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, REGION)
 hostname = tags['Name'] || `curl -s http://169.254.169.254/latest/meta-data/local-hostname`
 
 # rewrite host option
 @options['host'] = "#{ip_addr}, #{hostname}"
 
 # get instances
-instances = Murakumo::Util.ec2_instances(AMAZON_ACCESS_KEY_ID, AMAZON_SECRET_ACCESS_KEY)
+ip_addrs = Murakumo::Util::ec2_private_ip_addresses(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, REGION)
 
 # rewrite initial-nodes
-nodes = instances.map {|i| i['privateIpAddress'] || '' }.select {|i| not i.empty? }
+nodes = ip_addrs.select {|inst_id, ip_addr, status|
+  status == 'running'
+}.map {|inst_id, ip_addr, status| ip_addr }
+
 @options['initial-nodes'] = nodes.join(',') unless nodes.empty?

data/etc/murakumo.server

@@ -134,6 +134,54 @@ host: $ip_addr, $hostname, 60
 #    unhealthy: 2
 #    script: |
 #      http_get '/index.html'
+
+# hook of server start
+#on-start: /foo/bar/on-start.sh # args: address hostname
+
+# hook of activation of backup/secondary
+#activity-check:
+#  foo:
+#    start-delay: 60
+#    interval: 10
+#    #init-status: undefined # active/inactive/undefined (default: undefined)
+#    active: 2    # active threshold count
+#    inactive: 2  # inactive threshold count
+#    on-activate: /usr/sbin/attach_if.sh   # args: address name status
+#    #on-inactivate: /foo/bar/zoo.sh       # args: address name status
+#  bar:
+#    start-delay: 60
+#    interval: 10
+#    #init-status: undefined # active/inactive/undefined (default: undefined)
+#    active: 2    # active threshold count
+#    inactive: 2  # inactive threshold count
+#    on-activate: /usr/sbin/attach_if.sh   # args: address name status
+#    #on-inactivate: /foo/bar/zoo.sh       # args: address name status
+
+## about activity-check
+## ---
+## when BACKUP:
+##   if BACKUP is started:
+##     init-status: active   -> on-inactivate
+##                  inactive -> nothing to do
+##   if MASTER became unhealthy or down:
+##     -> on-activate
+##   if MASTER is restored:
+##     -> on-inactivate
+##
+## when MASTER:
+##   if MASTER is started:
+##     init-status: active   -> nothing to do
+##                  inactive -> on-activate
+##   if BACKUP became unhealthy or down:
+##     -> nothing to do
+##   if MASTER became unhealthy: 
+##     -> on-inactivate
+##   if MASTER became down:
+##     -> cannot do anything
+##   if MASTER is restored from down:
+##     -> same as MASTER start
+##   if MASTER is restored from unhealthy:
+##     -> on-activate
 EOF
 
   chmod 600 $conf

data/etc/murakumo.yml.example

@@ -57,20 +57,68 @@ alias:
   - foo,60,master,100
   - bar,60,master,100
 
-health-check:
-  foo:
-    interval: 5
-    timeout: 5
-    healthy: 2
-    unhealthy: 2
-    #on-activate: /foo/bar/zoo.sh   # args: address name status
-    #on-inactivate: /foo/bar/zoo.sh # args: address name status
-    script: |
-      tcp_check 80
-  bar:
-    interval: 5
-    timeout: 5
-    healthy: 2
-    unhealthy: 2
-    script: |
-      http_get '/index.html'
+#health-check:
+#  foo:
+#    interval: 5
+#    timeout: 5
+#    healthy: 2
+#    unhealthy: 2
+#    #on-activate: /foo/bar/zoo.sh   # args: address name status
+#    #on-inactivate: /foo/bar/zoo.sh # args: address name status
+#    script: |
+#      tcp_check 80
+#  bar:
+#    interval: 5
+#    timeout: 5
+#    healthy: 2
+#    unhealthy: 2
+#    script: |
+#      http_get '/index.html'
+
+# hook of server start
+#on-start: /foo/bar/on-start.sh # args: address hostname
+
+# hook of activation of backup/secondary
+#activity-check:
+#  foo:
+#    start-delay: 60
+#    interval: 10
+#    #init-status: undefined # active/inactive/undefined (default: undefined)
+#    active: 2    # active threshold count
+#    inactive: 2  # inactive threshold count
+#    on-activate: /usr/sbin/attach_if.sh   # args: address name status
+#    #on-inactivate: /foo/bar/zoo.sh       # args: address name status
+#  bar:
+#    start-delay: 60
+#    interval: 10
+#    #init-status: undefined # active/inactive/undefined (default: undefined)
+#    active: 2    # active threshold count
+#    inactive: 2  # inactive threshold count
+#    on-activate: /usr/sbin/attach_if.sh   # args: address name status
+#    #on-inactivate: /foo/bar/zoo.sh       # args: address name status
+
+## about activity-check
+## ---
+## when BACKUP:
+##   if BACKUP is started:
+##     init-status: active   -> on-inactivate
+##                  inactive -> nothing to do
+##   if MASTER became unhealthy or down:
+##     -> on-activate
+##   if MASTER is restored:
+##     -> on-inactivate
+##
+## when MASTER:
+##   if MASTER is started:
+##     init-status: active   -> nothing to do
+##                  inactive -> on-activate
+##   if BACKUP became unhealthy or down:
+##     -> nothing to do
+##   if MASTER became unhealthy: 
+##     -> on-inactivate
+##   if MASTER became down:
+##     -> cannot do anything
+##   if MASTER is restored from down:
+##     -> same as MASTER start
+##   if MASTER is restored from unhealthy:
+##     -> on-activate

data/lib/cli/murakumo_initializer_context.rb

@@ -2,6 +2,9 @@ require 'misc/murakumo_const'
 require 'util/murakumo_self_ip_address'
 require 'util/murakumo_ec2_tags'
 require 'util/murakumo_ec2_instances'
+require 'util/murakumo_ec2_private_ip_addresses'
+require 'util/murakumo_ec2_attach_interface'
+require 'util/murakumo_ec2_interfaces'
 
 module Murakumo
 

data/lib/cli/murakumo_options.rb

@@ -220,9 +220,80 @@ def murakumo_parse_args
               parse_error('configuration of a health check is not right', "#{name}/#{key}")
             end
           end
+
+          # 各種変数の設定
+          {
+            'interval'  => [ 5, 1, 300],
+            'timeout'   => [ 5, 1, 300],
+            'healthy'   => [ 2, 1,  60],
+            'unhealthy' => [ 2, 1,  60],
+          }.each {|key, vals|
+            defval, min, max = vals
+            value = (conf[key] || defval).to_i
+
+            if value < min
+              value = min
+              parse_error("health-check/#{name}/#{key} is smaller than #{min}.", "#{name}/#{key}")
+            elsif value > max
+              value = max
+              parse_error("health-check/#{name}/#{key} is larger than #{max}.", "#{name}/#{key}")
+            end
+
+            conf[key] = value
+          }
         end
       end # health check
 
+      # activity check
+      if (activity_check = options[:activity_check])
+        activity_check.kind_of?(Hash) or parse_error('configuration of a activity check is not right')
+
+        activity_check.each do |name, conf|
+          # 'on-activate'か'on-inactivate'のいずれかが必須
+          if (conf['on-activate'] || conf['on-inactivate'] || '').empty?
+            parse_error('configuration of a health check is not right', "on-activate or on-inactivate is not defined")
+          end
+
+          conf['init-status'] ||= 'undefined'
+
+          unless /\A(active|inactive|undefined)\Z/i =~ conf['init-status']
+            parse_error('configuration of a health check is not right', "#{name}/init-status")
+          end
+
+          conf['init-status'] = conf['init-status'].downcase.to_sym
+
+          %w(on-activate on-inactivate).each do |key|
+            next unless conf[key]
+            path = conf[key] = conf[key].strip
+
+            if FileTest.directory?(path) or not FileTest.executable?(path)
+              parse_error('configuration of a health check is not right', "#{name}/#{key}")
+            end
+          end
+
+          # 各種変数の設定
+          {
+            'interval'    => [ 10, 1, 300],
+            'start-delay' => [ 60, 1, 300],
+            'active'      => [  2, 1,  60],
+            'inactive'    => [  2, 1,  60],
+          }.each {|key, vals|
+            defval, min, max = vals
+              value = (conf[key] || defval).to_i
+
+            if value < min
+              value = min
+              parse_error("activateation-check/#{name}/#{key} is smaller than #{min}.", "#{name}/#{key}")
+            elsif value > max
+              value = max
+              parse_error("activation-check/#{name}/#{key} is larger than #{max}.", "#{name}/#{key}")
+            end
+
+            conf[key] = value
+          }
+        end
+      end # activity check
+
       # notification
       if (ntfc = options[:notification])
         ntfc.kind_of?(Hash) or parse_error('configuration of a notification is not right')
@@ -318,6 +389,13 @@ def murakumo_parse_args
           balancing_h[reg_dest] = attrs_h
         end
       end # balancing
+
+      # on start
+      if (on_start = options[:on_start])
+        unless File.exist?(on_start)
+          parse_error('on_start script is not found')
+        end
+      end # on start
     end # after
 
     error do |e|

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 
   # Priority
   MASTER = 1

data/lib/srv/murakumo_activity_check_notifier.rb

@@ -0,0 +1,55 @@
+require 'net/smtp'
+require 'time'
+
+module Murakumo
+
+  class ActivityCheckNotifier
+
+    def initialize(address, name, logger, options)
+      @address = address
+      @name = name
+      @logger = logger
+      @args = options[:args]
+      @sender = options[:sender]
+      @recipients = options[:recipients]
+      @open_timeout = options[:open_timeout]
+      @read_timeout = options[:read_timeout]
+    end
+
+    def notify_active
+      notify('active', "#{@name} became active.")
+    end
+
+    def notify_inactive
+      notify('inactive', "#{@name} became inactive. Zzz...")
+    end
+
+    private
+    def notify(status, body)
+      Net::SMTP.start(*@args) do |smtp|
+        smtp.open_timeout = @open_timeout if @open_timeout
+        smtp.read_timeout = @read_timeout if @read_timeout
+
+        smtp.send_mail(<<-EOS, @sender, *@recipients)
+From: Murakumo Activity Check Notifier <#{@sender}>
+To: #{@recipients.join(', ')}
+Subject: [Activity] #{@name}/#{@address} => #{status}
+Date: #{Time.now.rfc2822}
+
+Address: #{@address}
+Name: #{@name}
+Status: #{status}
+
+#{body.strip}
+        EOS
+      end
+
+      @logger.info("sent the notice: #{status}")
+    rescue Exception => e
+      message = (["#{e.class}: #{e.message}"] + (e.backtrace || [])).join("\n\tfrom ")
+      @logger.error("activity check failed: #{@name}: #{message}")
+    end
+
+  end # ActivityCheckNotifier
+
+end # Murakumo

data/lib/srv/murakumo_activity_checker.rb

@@ -0,0 +1,198 @@
+require 'open3'
+
+require 'srv/murakumo_activity_check_notifier'
+require 'misc/murakumo_const'
+
+module Murakumo
+
+  class ActivityChecker
+
+    def initialize(address, name, cloud, logger, options)
+      @address = address
+      @name = name
+      @cloud = cloud
+      @logger = logger
+      @options = options
+
+      # 各種変数の設定
+      ['interval', 'start-delay', 'active', 'inactive', 'init-status'].each {|key|
+        value = options[key]
+        instance_variable_set("@#{key.gsub('-', '_')}", value)
+      }
+
+      # 通知オブジェクトの設定
+      if options[:notification]
+        @notifier = ActivityCheckNotifier.new(@address, @name, @logger, options[:notification])
+      end
+
+      # イベントハンドラの設定
+      @on_activate = options['on-activate']
+      @on_inactivate = options['on-inactivate']
+    end
+
+    def mark_active
+      if @activated.nil?
+        # 状態がなかったら、まず状態をセット
+        @logger.info("initial activity: #{@name}: active")
+        @activated = true
+      elsif @activated == true # わざとですよ…
+        @inactive_count = 0
+      elsif (@active_count += 1) >= @active
+        toggle_activity
+      end
+    end
+
+    def mark_inactive
+      if @activated.nil?
+        # 状態がなかったら、まず状態をセット
+        @logger.info("initial activity: #{@name}: inactive")
+        @activated = false
+      elsif @activated == false # わざとですよ…
+        @active_count = 0
+      elsif (@inactive_count += 1) >= @inactive
+        toggle_activity
+      end
+    end
+
+    def toggle_activity
+      @activated = !@activated
+      @active_count = 0
+      @inactive_count = 0
+
+      status = @activated ? 'active' : 'inactive'
+      @logger.info("activity condition changed: #{@name}: #{status}")
+
+      if @activated
+        @notifier.notify_active if @notifier
+        handle_event(@on_activate, 'active') if @on_activate
+      else
+        @notifier.notify_inactive if @notifier
+        handle_event(@on_inactivate, 'inactive') if @on_inactivate
+      end
+    end
+
+    def start
+      # 各種変数は初期状態にする
+      @alive = true
+      @active_count = 0
+      @inactive_count = 0
+
+      # アクティビティの初期状態を設定
+      case @init_status
+      when :active
+        @activated = true
+        @logger.info("initial activity: #{@name}: active")
+      when :inactive
+        @activated = false
+        @logger.info("initial activity: #{@name}: inactive")
+      else
+        @activated = nil
+      end
+
+      # 既存のスレッドは破棄
+      if @thread and @thread.alive?
+        begin
+          @thread.kill
+        rescue ThreadError
+        end
+      end
+
+      @thread = Thread.start {
+        begin
+          # 初回実行の遅延
+          if @start_delay
+            @logger.debug("activity check is delaying: #{@name}")
+            sleep @start_delay
+            @start_delay = nil
+            @logger.debug("activity check is starting: #{@name}")
+          end
+
+          while @alive
+            retval = nil
+
+            begin
+              retval = validate_activity
+            rescue => e
+              retval = false
+              message = (["#{e.class}: #{e.message}"] + (e.backtrace || [])).join("\n\tfrom ")
+              @logger.error("activity check failed: #{@name}: #{message}")
+            end
+
+            status = retval == true ? 'active' : retval == false ? 'inactive' : '-'
+            @logger.debug("result of a activity check: #{@name}: #{status}")
+
+            if retval == true
+              mark_active
+            elsif retval == false
+              mark_inactive
+            end
+
+            sleep @interval
+          end # while
+        rescue Exception => e
+          message = (["#{e.class}: #{e.message}"] + (e.backtrace || [])).join("\n\tfrom ")
+          @logger.error("#{@name}: #{message}")
+        end # begin
+      }
+    end
+
+    def stop
+      @alive = false
+    end
+
+    def alive?
+      @alive
+    end
+
+    private
+
+    def validate_activity
+      records = @cloud.db.execute(<<-EOS, @name, ACTIVE)
+        SELECT ip_address, priority FROM records
+        WHERE name = ? AND activity = ?
+      EOS
+
+      # レコードがなければ非アクティブ
+      return false if records.empty?
+
+      # マスタに自IPが含まれているならアクティブ
+      masters = records.select {|i| i['priority'] == MASTER }
+
+      if masters.any? {|i| i['ip_address'] == @address }
+        return true
+      end
+
+      # マスタがなくてセカンダリに自IPが含まれているならアクティブ
+      secondaries = records.select {|i| i['priority'] == SECONDARY }
+
+      if masters.empty? and secondaries.any? {|i| i['ip_address'] == @address }
+        return true
+      end
+
+      # マスタ・セカンダリがなくてバックアップに自IPが含まれているならアクティブ
+      backups = records.select {|i| i['priority'] == BACKUP }
+
+      if masters.empty? and secondaries.empty? and backups.any? {|i| i['ip_address'] == @address }
+        return true
+      end
+
+      # 上記以外は非アクティブ
+      return false
+    end
+
+    def handle_event(handler, status)
+      Open3.popen3("#{@on_activate} '#{@address}' '#{@name}' '#{status}'") do |stdin, stdout, stderr|
+        out = stdout.read.strip
+        @logger.info(out) unless out.empty?
+
+        err = stderr.read.strip
+        @logger.error(err) unless err.empty?
+      end
+    rescue Exception => e
+      message = (["#{e.class}: #{e.message}"] + (e.backtrace || [])).join("\n\tfrom ")
+      @logger.error("#{@name}: #{message}")
+    end
+
+  end # ActivityChecker
+
+end # Murakumo

data/lib/srv/murakumo_cloud.rb

@@ -1,8 +1,10 @@
 require 'forwardable'
 require 'rgossip2'
 require 'sqlite3'
+require 'open3'
 
 require 'srv/murakumo_health_checker'
+require 'srv/murakumo_activity_checker'
 require 'srv/murakumo_balancer'
 require 'misc/murakumo_const'
 
@@ -96,6 +98,34 @@ module Murakumo
         end
       end
 
+      # アクティビティチェック
+      @activity_checkers = {}
+
+      if options[:activity_check]
+        activity_check = options[:activity_check]
+
+        if activity_check.kind_of?(Hash)
+          activity_check.each do |name, conf|
+            name = name.downcase
+
+            if options[:notification]
+              conf = conf.merge(:notification => options[:notification])
+            end
+
+            if datas.any? {|i| i[0] == name }
+              checker = ActivityChecker.new(@address, name, self, @logger, conf)
+              @activity_checkers[name] = checker
+              # アクティビティチェックはまだ起動しない
+            else
+              # ホスト名になかったら警告
+              @logger.warn("host for a activity check is not found: #{name}")
+            end
+          end
+        else
+          @logger.warn('configuration of a activity check is not right')
+        end
+      end
+
       # キャッシュ
       @cache = {} if options[:enable_cache]
 
@@ -113,9 +143,34 @@ module Murakumo
         checker.start
       end
 
+      # アクティビティチェックを起動
+      @activity_checkers.each do |name, checker|
+        checker.start
+      end
+
+      # 起動時フックスクリプトの実行
+      if @options[:on_start]
+        exec_start_script(@options[:on_start])
+      end
+
       @gossip.start
     end
 
+    def exec_start_script(script)
+      @logger.info("starting script is performed: #{script}")
+
+      Open3.popen3("#{script} '#{@address}' '#{@hostname}'") do |stdin, stdout, stderr|
+        out = stdout.read.strip
+        @logger.info(out) unless out.empty?
+
+        err = stderr.read.strip
+        @logger.error(err) unless err.empty?
+      end
+    rescue Exception => e
+      message = (["#{e.class}: #{e.message}"] + (e.backtrace || [])).join("\n\tfrom ")
+      @logger.error("#{@name}: #{message}")
+    end
+
     def to_hash
       keys = {
         :auth_key      => 'auth-key',
@@ -166,7 +221,7 @@ module Murakumo
       hash['host'] = records.find {|r| r[3] == ORIGIN }[0..2].join(',')
 
       aliases = records.select {|r| r[3] != ORIGIN }.map do |r|
-        [r[1], r[2], (r[3] == MASTER ? 'master' : 'backup'), r[4]].join(',')
+        [r[1], r[2], (r[3] == MASTER ? 'master' : r[3] == SECONDARY ? 'secondary' : 'backup'), r[4]].join(',')
       end
 
       hash['alias'] = aliases unless aliases.empty?
@@ -177,6 +232,10 @@ module Murakumo
           hash['health-check'] = @options.config_file['health-check']
         end
 
+        if @options.config_file['activity-check']
+          hash['activity-check'] = @options.config_file['activity-check']
+        end
+
         if @options.config_file['notification']
           hash['notification'] = @options.config_file['notification']
         end
@@ -190,6 +249,10 @@ module Murakumo
         if @options.config_file['balancing']
           hash['balancing'] = @options.config_file['balancing']
         end
+
+        if @options.config_file['on-start']
+          hash['on-start'] = @options.config_file['on-start']
+        end
       end # 設定ファイルのみの項目
 
       return hash

data/lib/srv/murakumo_health_check_notifier.rb

@@ -18,11 +18,11 @@ module Murakumo
     end
 
     def notify_active
-      notify('Active', "#{@name} changed into the activity status.")
+      notify('healthy', "#{@name} became healthy :-)")
     end
 
     def notify_inactive
-      notify('Inactive', "#{@name} changed into the inactivity status.")
+      notify('unhealthy', "#{@name} became unhealthy :-(")
     end
 
     private
@@ -32,9 +32,9 @@ module Murakumo
         smtp.read_timeout = @read_timeout if @read_timeout
 
         smtp.send_mail(<<-EOS, @sender, *@recipients)
-From: Murakumo Notifier <#{@sender}>
+From: Murakumo Health Check Notifier <#{@sender}>
 To: #{@recipients.join(', ')}
-Subject: #{@name}/#{@address} => #{status}
+Subject: [Health] #{@name}/#{@address} => #{status}
 Date: #{Time.now.rfc2822}
 
 Address: #{@address}
@@ -48,7 +48,7 @@ Status: #{status}
       @logger.info("sent the notice: #{status}")
     rescue Exception => e
       message = (["#{e.class}: #{e.message}"] + (e.backtrace || [])).join("\n\tfrom ")
-      @logger.error("healthcheck failed: #{@name}: #{message}")
+      @logger.error("health check failed: #{@name}: #{message}")
     end
 
   end # HealthCheckNotifier

data/lib/srv/murakumo_health_checker.rb

@@ -18,16 +18,8 @@ module Murakumo
       @options = options
 
       # 各種変数の設定
-      {
-        'interval'  => [30, 1, 300],
-        'timeout'   => [ 5, 1, 300],
-        'healthy'   => [10, 2,  10],
-        'unhealthy' => [ 2, 2,  10],
-      }.each {|key, vals|
-        defval, min, max = vals
-        value = (options[key] || defval).to_i
-        value = min if value < min
-        value = max if value > max
+      ['interval', 'timeout', 'healthy', 'unhealthy'].each {|key|
+        value = options[key]
         instance_variable_set("@#{key}", value)
       }
 
@@ -87,10 +79,10 @@ module Murakumo
       case activity
       when ACTIVE
         @notifier.notify_active if @notifier
-        handle_event(@on_activate, 'Active') if @on_activate
+        handle_event(@on_activate, 'healthy') if @on_activate
       when INACTIVE
         @notifier.notify_inactive if @notifier
-        handle_event(@on_inactivate, 'Inactive') if @on_inactivate
+        handle_event(@on_inactivate, 'unhealthy') if @on_inactivate
       end
     end
 
@@ -110,9 +102,6 @@ module Murakumo
       end
 
       @thread = Thread.start {
-        healthy = 0
-        unhealthy = 0
-
         begin
           while @alive
             retval = nil
@@ -126,7 +115,7 @@ module Murakumo
             rescue => e
               retval = false
               message = (["#{e.class}: #{e.message}"] + (e.backtrace || [])).join("\n\tfrom ")
-              @logger.error("healthcheck failed: #{@name}: #{message}")
+              @logger.error("health check failed: #{@name}: #{message}")
             end
 
             status = retval == true ? 'good' : retval == false ? 'bad' : '-'

data/lib/util/murakumo_ec2_attach_interface.rb

@@ -0,0 +1,108 @@
+require 'net/http'
+require 'rexml/document'
+
+require 'util/murakumo_ec2_client'
+require 'util/murakumo_ec2_interfaces'
+
+module Murakumo
+
+  class Util
+    WAIT_LIMIT = 99
+    WAIT_INTERVAL = 0.3
+
+    def self.ec2_attach_interface(access_key, secret_key, if_id, dev_idx = 1, endpoint = nil, instance_id = nil)
+      dev_idx = 1 unless dev_idx
+
+      unless instance_id
+        instance_id = Net::HTTP.get('169.254.169.254', '/latest/meta-data/instance-id')
+      end
+
+      check_own_attached(access_key, secret_key, endpoint, if_id, instance_id)
+
+      ec2_detach_interface(access_key, secret_key, if_id, endpoint, :force) rescue nil
+
+      wait_detach(access_key, secret_key, endpoint, if_id)
+
+      ec2cli = Murakumo::Util::EC2Client.new(access_key, secret_key, endpoint)
+      source = ec2cli.query('AttachNetworkInterface',
+        'NetworkInterfaceId' => if_id, 'InstanceId' => instance_id, 'DeviceIndex' => dev_idx)
+
+      errors = []
+
+      REXML::Document.new(source).each_element('//Errors/Error') do |element|
+        code = element.text('Code')
+        message = element.text('Message')
+        errors << "#{code}:#{message}"
+      end
+
+      raise errors.join(', ') unless errors.empty?
+    end
+
+    def self.ec2_detach_interface(access_key, secret_key, if_id, endpoint = nil, force = false)
+      interfaces = ec2_interfaces(access_key, secret_key, endpoint, if_id)
+
+      if not interfaces or interfaces.empty?
+        raise 'interface was not found'
+      end
+
+      interface = interfaces.first
+      attachment_id = (interface['attachment'] || {})['attachmentId'] || ''
+
+      if attachment_id.empty?
+        raise 'attachmentId was not found'
+      end
+
+      ec2cli = Murakumo::Util::EC2Client.new(access_key, secret_key, endpoint)
+
+      params = {'AttachmentId' => attachment_id}
+      params['Force'] = true if force
+      source = ec2cli.query('DetachNetworkInterface', params)
+
+      errors = []
+
+      REXML::Document.new(source).each_element('//Errors/Error') do |element|
+        code = element.text('Code')
+        message = element.text('Message')
+        errors << "#{code}:#{message}"
+      end
+
+      raise errors.join(', ') unless errors.empty?
+    end
+
+    def self.check_own_attached(access_key, secret_key, endpoint, if_id, instance_id)
+      interfaces = ec2_interfaces(access_key, secret_key, endpoint, if_id)
+
+      if not interfaces or interfaces.empty?
+        raise 'interface was not found'
+      end
+
+      interface = interfaces.first
+
+      if (interface['attachment'] || {})['instanceId'] == instance_id
+        raise 'interface is already attached'
+      end
+    end
+    private_class_method :check_own_attached
+
+    def self.wait_detach(access_key, secret_key, endpoint, if_id)
+      WAIT_LIMIT.times do
+        interfaces = ec2_interfaces(access_key, secret_key, endpoint, if_id)
+
+        if not interfaces or interfaces.empty?
+          raise 'interface was not found'
+        end
+
+        interface = interfaces.first
+
+        return if interface['status'] == 'available'
+
+        sleep WAIT_INTERVAL
+      end
+
+      raise 'cannot detach interface'
+    end
+    private_class_method :wait_detach
+
+  end # Util
+
+end # Murakumo

data/lib/util/murakumo_ec2_client.rb

@@ -11,10 +11,11 @@ module Murakumo
 
     class EC2Client
 
-      API_VERSION = '2011-12-01'
+      API_VERSION = '2011-12-15'
       SIGNATURE_VERSION = 2
+      SIGNATURE_ALGORITHM = :SHA256
 
-      def initialize(accessKeyId, secretAccessKey, endpoint = nil, algorithm = :SHA256)
+      def initialize(accessKeyId, secretAccessKey, endpoint = nil)
         unless endpoint
           local_hostname = Net::HTTP.get('169.254.169.254', '/latest/meta-data/local-hostname')
 
@@ -28,7 +29,6 @@ module Murakumo
         @accessKeyId = accessKeyId
         @secretAccessKey = secretAccessKey
         @endpoint = endpoint
-        @algorithm = algorithm
 
         if /\A[^.]+\Z/ =~ @endpoint
           @endpoint = "ec2.#{@endpoint}.amazonaws.com"
@@ -41,7 +41,7 @@ module Murakumo
           :Version          => API_VERSION,
           :Timestamp        => Time.now.getutc.strftime('%Y-%m-%dT%H:%M:%SZ'),
           :SignatureVersion => SIGNATURE_VERSION,
-          :SignatureMethod  => "Hmac#{@algorithm}",
+          :SignatureMethod  => "Hmac#{SIGNATURE_ALGORITHM}",
           :AWSAccessKeyId   => @accessKeyId,
         }.merge(params)
 
@@ -69,7 +69,7 @@ module Murakumo
       def aws_sign(params)
         params = params.sort_by {|a, b| a.to_s }.map {|k, v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join('&')
         string_to_sign = "POST\n#{@endpoint}\n/\n#{params}"
-        digest = OpenSSL::HMAC.digest(OpenSSL::Digest.const_get(@algorithm).new, @secretAccessKey, string_to_sign)
+        digest = OpenSSL::HMAC.digest(OpenSSL::Digest.const_get(SIGNATURE_ALGORITHM).new, @secretAccessKey, string_to_sign)
         Base64.encode64(digest).gsub("\n", '')
       end
     end

data/lib/util/murakumo_ec2_interfaces.rb

@@ -0,0 +1,59 @@
+require 'net/http'
+require 'rexml/document'
+
+require 'util/murakumo_ec2_client'
+
+module Murakumo
+
+  class Util
+
+    def self.ec2_interfaces(access_key, secret_key, endpoint = nil, if_id = nil)
+      dev_idx = 1 unless dev_idx
+      params = {}
+
+      if if_id
+        params.update('Filter.1.Name' => 'network-interface-id', 'Filter.1.Value' => if_id)
+      end
+
+      ec2cli = Murakumo::Util::EC2Client.new(access_key, secret_key, endpoint)
+
+      source = ec2cli.query('DescribeNetworkInterfaces', params)
+      interfaces = []
+
+      items = REXML::Document.new(source).get_elements('//networkInterfaceSet/item')
+      walk_item_list(items, interfaces)
+
+      return interfaces
+    end
+
+    def self.walk_item_list(list, ary)
+      list.each do |item|
+        hash = {}
+        walk_item(item, hash)
+        ary << hash
+      end
+    end 
+    private_class_method :walk_item_list
+
+    def self.walk_item(item, hash)
+      return unless item.has_elements?
+
+      item.elements.each do |child|
+        if child.has_elements?
+          if child.elements.all? {|i| i.name =~ /\Aitem\Z/i }
+            hash[child.name] = nested = []
+            walk_item_list(child.elements, nested)
+          else
+            hash[child.name] = nested = {}
+            walk_item(child, nested)
+          end
+        else
+          hash[child.name] = child.text
+        end
+      end
+    end
+    private_class_method :walk_item
+
+  end # Util
+
+end # Murakumo

data/lib/util/murakumo_ec2_private_ip_addresses.rb

@@ -0,0 +1,42 @@
+require 'net/http'
+require 'rexml/parsers/pullparser'
+
+require 'util/murakumo_ec2_client'
+
+module Murakumo
+
+  class Util
+
+    def self.ec2_private_ip_addresses(access_key, secret_key, endpoint = nil)
+      ec2cli = Murakumo::Util::EC2Client.new(access_key, secret_key, endpoint)
+      source = ec2cli.query('DescribeInstances')
+
+      parser = REXML::Parsers::PullParser.new(source)
+      ip_addrs = []
+      instance_id = nil
+      status = nil
+
+      while parser.has_next?
+        event = parser.pull
+        next if event.event_type != :start_element
+
+        case event[0]
+        when 'instanceId'
+          instance_id = parser.pull[0]
+        when 'instanceState'
+          until event.event_type == :start_element and event[0] == 'name'
+            event = parser.pull
+          end
+
+          status = parser.pull[0]
+        when 'privateIpAddress'
+          ip_addrs << [instance_id, parser.pull[0], status]
+        end
+      end
+
+      return ip_addrs
+    end
+
+  end # Util
+
+end # Murakumo

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - winebarrel
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 +09:00
-default_executable: 
+date: 2012-01-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubydns
@@ -42,12 +41,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 17
         segments: 
         - 0
-        - 1
-        - 8
-        version: 0.1.8
+        - 2
+        - 3
+        version: 0.2.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -91,41 +90,52 @@ executables:
 - murakumo-show-ip-address
 - murakumo-show-ec2-tags
 - murakumo-show-ec2-instances
+- murakumo-show-ec2-private-ip-addresses
+- murakumo-attach-ec2-attach-interface
+- murakumo-show-ec2-interfaces
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - README
-- bin/murakumo-show-ec2-tags
-- bin/murakumo-install-init-script
 - bin/murakumo-show-ec2-instances
+- bin/murakumo-show-ec2-private-ip-addresses
+- bin/murakumo-attach-ec2-attach-interface
 - bin/murakumo
+- bin/murakumo-show-ec2-tags
 - bin/murakumo-show-ip-address
+- bin/murakumo-show-ec2-interfaces
+- bin/murakumo-install-init-script
 - bin/mrkmctl
-- lib/misc/murakumo_const.rb
-- lib/srv/murakumo_health_check_context.rb
-- lib/srv/murakumo_balancer.rb
-- lib/srv/murakumo_cloud.rb
-- lib/srv/murakumo_health_check_notifier.rb
-- lib/srv/murakumo_health_checker.rb
-- lib/srv/murakumo_server.rb
-- lib/cli/mrkmctl_options.rb
-- lib/cli/murakumo_initializer_context.rb
 - lib/cli/mrkmctl.rb
 - lib/cli/murakumo.rb
 - lib/cli/murakumo_options.rb
+- lib/cli/murakumo_initializer_context.rb
+- lib/cli/mrkmctl_options.rb
+- lib/misc/murakumo_const.rb
+- lib/util/murakumo_ec2_private_ip_addresses.rb
 - lib/util/murakumo_ec2_instances.rb
-- lib/util/murakumo_self_ip_address.rb
 - lib/util/murakumo_ec2_tags.rb
+- lib/util/murakumo_ec2_interfaces.rb
+- lib/util/murakumo_self_ip_address.rb
+- lib/util/murakumo_ec2_attach_interface.rb
 - lib/util/murakumo_ec2_client.rb
+- lib/srv/murakumo_health_check_context.rb
+- lib/srv/murakumo_server.rb
+- lib/srv/murakumo_health_check_notifier.rb
+- lib/srv/murakumo_activity_check_notifier.rb
+- lib/srv/murakumo_activity_checker.rb
+- lib/srv/murakumo_health_checker.rb
+- lib/srv/murakumo_balancer.rb
+- lib/srv/murakumo_cloud.rb
+- etc/murakumo.server
 - etc/murakumo-init.rb.for-ec2
+- etc/murakumo.yml.example
 - etc/gai.conf.example
-- etc/murakumo.server
-- etc/dhclient-script.patch
 - etc/murakumo-update-config-for-ec2
-- etc/murakumo.yml.example
-has_rdoc: true
+- etc/attach_if.sh.example
+- etc/dhclient-script.patch
 homepage: https://github.com/cookpad/murakumo/wiki
 licenses: []
 
@@ -155,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Murakumo is the internal DNS server which manages name information using a gossip protocol.