murakumo 0.4.5 → 0.4.6

data/etc/murakumo.server

@@ -79,6 +79,12 @@ max-ip-num: 8
 # (another way)
 #init-script: /foo/bar/zoo/murakumo-init.rb
 
+# verifies communication of initial nodes
+#ping-init-nodes: true
+
+# delay of a gossip start (cli arg: -D)
+#gossip-start-delay: 60
+
 #name-includes: ^app-\d+$, ^db-\d+$
 #name-excludes: 
 #addr-includes: ^10\..*
@@ -123,6 +129,7 @@ host: $ip_addr, $hostname, 60
 #    timeout: 5
 #    healthy: 2
 #    unhealthy: 2
+#    #init-status: inactive # active/inactive (default: active)
 #    #on-activate: /foo/bar/zoo.sh   # args: address name status
 #    #on-inactivate: /foo/bar/zoo.sh # args: address name status
 #    script: |

data/etc/murakumo.yml.example

@@ -19,6 +19,12 @@ max-ip-num: 8
 # (another way)
 #init-script: /foo/bar/zoo/murakumo-init.rb
 
+# verifies communication of initial nodes
+#ping-init-nodes: true
+
+# delay of a gossip start (cli arg: -D)
+#gossip-start-delay: 60
+
 #name-includes: ^app-\d+$, ^db-\d+$
 #name-excludes: 
 #addr-includes: ^10\..*
@@ -63,6 +69,7 @@ alias:
 #    timeout: 5
 #    healthy: 2
 #    unhealthy: 2
+#    #init-status: inactive # active/inactive (default: active)
 #    #on-activate: /foo/bar/zoo.sh   # args: address name status
 #    #on-inactivate: /foo/bar/zoo.sh # args: address name status
 #    script: |

data/lib/cli/mrkmctl.rb

@@ -18,6 +18,9 @@ begin
   case cmd
   # 一覧表示
   when :list
+    # アドレスの取得
+    address = there.address
+
     # レコードの取得
     records = there.list_records
 
@@ -48,11 +51,13 @@ begin
       puts 'No macth'
     else
       puts <<-EOF
-IP address       TTL     Priority   Weight  Activity  Hostname
----------------  ------  ---------  ------  --------  ----------
+  IP address       TTL     Priority   Weight  Activity  Hostname
+  ---------------  ------  ---------  ------  --------  ----------
       EOF
       records.each do |r|
-        puts '%-15s  %6d  %-9s  %6s  %-8s  %s' % r.values_at(0, 2, 3, 4, 5, 1)
+        values = r.values_at(0, 2, 3, 4, 5, 1)
+        values.unshift(address == values[0] ? '*' : ' ')
+        puts '%s %-15s  %6d  %-9s  %6s  %-8s  %s' % values
       end
     end
 

data/lib/cli/murakumo_options.rb

@@ -131,6 +131,12 @@ def murakumo_parse_args
     desc 'reception timeout of a gossip protocol'
     option :gossip_receive_timeout, '-O', '--gossip-receive-timeout NUM', :type => Integer, :default => 3
 
+    desc 'verifies communication of initial nodes'
+    option :ping_init_nodes, '-V', '--ping-init-nodes', :default => false
+
+    desc 'delay of a gossip start'
+    option :gossip_start_delay, '-D', '--gossip-start-delay', :type => Integer, :default => 0
+
     after do |options|
       # auth_key
       if File.exist?(options[:auth_key])
@@ -203,6 +209,11 @@ def murakumo_parse_args
         parse_error('same hostname was found')
       end
 
+      # ping init nodes
+      if options[:ping_init_nodes]
+        options[:ping_init_nodes] = !!options[:ping_init_nodes]
+      end
+
       # health check
       if (health_check = options[:health_check])
         health_check.kind_of?(Hash) or parse_error('configuration of a health check is not right')
@@ -221,6 +232,18 @@ def murakumo_parse_args
             end
           end
 
+          conf['init-status'] ||= 'active'
+
+          unless /\A(active|inactive)\Z/i =~ conf['init-status']
+            parse_error('configuration of a health check is not right', "#{name}/init-status")
+          end
+
+          if conf['init-status'] =~ /\Aactive\Z/i
+            conf['init-status'] = Murakumo::ACTIVE
+          else
+            conf['init-status'] = Murakumo::INACTIVE
+          end
+
           # 各種変数の設定
           {
             'interval'  => [ 5, 1, 300],

data/lib/misc/murakumo_const.rb

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

data/lib/srv/murakumo_activity_check_notifier.rb

@@ -44,7 +44,7 @@ Status: #{status}
         EOS
       end
 
-      @logger.info("sent the notice: #{status}")
+      @logger.info("sent notice: #{status}")
     rescue Exception => e
       message = (["#{e.class}: #{e.message}"] + (e.backtrace || [])).join("\n\tfrom ")
       @logger.error("activity check failed: #{@name}: #{message}")

data/lib/srv/murakumo_balancer.rb

@@ -108,28 +108,65 @@ module Murakumo
       end
 
       # 宛先をソート
-      dests = (0...records.length).map {|i| [records[i]['ip_address'], i] }.sort_by {|a, b| a }
+      dests = (0...records.length).map {
+        |i| [records[i].values_at('ip_address', 'weight'), i].flatten
+      }.sort_by {|addr, weight, i| addr }
       dests_orig = dests
       dests_orig_len = dests_orig.length
 
-      # 数をそろえる
-      if sources.length < dests.length
-        dests = dests.slice(0, sources.length)
-      elsif sources.length > dests.length
-        dests = dests_orig = dests * (sources.length.to_f / dests.length).ceil
-        dests = dests.slice(0, sources.length)
+      # 按分する
+      dests = arrange_length(sources, dests)
+
+      # 宛先がない場合はとりあえずランダムで
+      if dests.length.zero?
+        @logger.warn('destination is not found')
+        return random(records, max_ip_num)
       end
 
       # 先頭を決めてローテート
-      first_index = sources.zip(dests).index {|s, d| s == @address }
+      first_record = sources.zip(dests).assoc(@address)[1]
+      first_index = dests_orig.index {|i| i[0] == first_record[0] }
 
       # 元の配列に戻す
       dests = (dests_orig + dests_orig).slice(first_index, dests_orig_len)
 
       # 先頭インデックスからレコードを並べ直す
-      yield(records.values_at(*dests.map {|addr, i| i }))
+      yield(records.values_at(*dests.map {|addr, weight, i| i }))
     end # fix_by_src0
 
+    def arrange_length(sources, dests)
+      weights = {}
+      sum = dests.inject(0) {|r, i| r + i[1] }
+
+      # 重みでソースの長さを按分する
+      dests.each do |addr, weight, i|
+        weights[addr] = ((weight.to_f / sum) * sources.length).round
+      end
+
+      # 端数分をそろえる
+      delta = weights.inject(0) {|r, i| r + i[1] } - sources.length
+      key_list = weights.sort_by {|k, v| k }.map {|k, v| k } # 順序は一定に！
+      addval = (delta > 0) ? -1 : 1
+
+      # ローテートしながら端数分を埋める
+      until delta.zero?
+        key = key_list.shift
+        key_list.push(key)
+        weights[key] += addval
+        delta += addval
+      end
+
+      new_dests = []
+
+      dests.each do |addr, weight, i|
+        weights[addr].to_i.times do
+          new_dests << [addr, weight, i]
+        end
+      end
+
+      return new_dests
+    end # arrange_length
+
   end # Balancer
 
 end # Murakumo

data/lib/srv/murakumo_cloud.rb

@@ -26,7 +26,12 @@ module Murakumo
       host_data = options[:host]
       @address = host_data.shift
       host_data.concat [ORIGIN, 0, ACTIVE]
-      alias_datas = options[:aliases].map {|r| r + [ACTIVE] }
+      alias_datas = options[:aliases].map {|r|
+        # ヘルスチェックの初期値に合わせて健康状態を設定
+        health_check_conf = (@options[:health_check] || {}).find {|k, v| k =~ /\A#{r[0]}\Z/i } || []
+        init_status = health_check_conf.fetch(1, {}).fetch('init-status', ACTIVE)
+        r + [init_status]
+      }
       @logger = options[:logger]
 
       # 名前は小文字に変換
@@ -54,6 +59,7 @@ module Murakumo
         :gossip_interval => options[:gossip_send_interval],
         :receive_timeout => options[:gossip_receive_timeout],
         :logger          => @logger,
+        :ping_init_nodes => options[:ping_init_nodes],
       })
 
       # ノードの更新をフック
@@ -153,7 +159,15 @@ module Murakumo
         exec_start_script(@options[:on_start])
       end
 
-      @gossip.start
+      @logger.info("Delay of a gossip start: #{@options[:gossip_start_delay]}")
+
+      Thread.start do
+        # ゴシッププロトコルの開始を遅延
+        sleep @options[:gossip_start_delay]
+
+        @logger.info('Gossip was started')
+        @gossip.start
+      end
     end
 
     def exec_start_script(script)
@@ -200,6 +214,8 @@ module Murakumo
           'gossip-receive-timeout',
           @gossip.context.receive_timeout
         ]},
+        :ping_init_nodes    => 'ping-init-nodes',
+        :gossip_start_delay => 'gossip-start-delay',
       }
 
       hash = {}
@@ -230,6 +246,16 @@ module Murakumo
       if @options.config_file
         if @options.config_file['health-check']
           hash['health-check'] = @options.config_file['health-check']
+
+          # ちょっと直したい…
+          hash['health-check'].values.each do |h|
+            next unless h['init-status']
+
+            h['init-status'] = {
+              ACTIVE   => 'active' ,
+              INACTIVE => 'inactive',
+            }.fetch(h['init-status'])
+          end
         end
 
         if @options.config_file['activity-check']

data/lib/srv/murakumo_health_check_notifier.rb

@@ -45,7 +45,7 @@ Status: #{status}
         EOS
       end
 
-      @logger.info("sent the notice: #{status}")
+      @logger.info("sent notice: #{status}")
     rescue Exception => e
       message = (["#{e.class}: #{e.message}"] + (e.backtrace || [])).join("\n\tfrom ")
       @logger.error("health check failed: #{@name}: #{message}")

data/lib/srv/murakumo_health_checker.rb

@@ -89,7 +89,7 @@ module Murakumo
     def start
       # 各種変数は初期状態にする
       @alive = true
-      @normal_health = true
+      @normal_health = (@options['init-status'] == ACTIVE)
       @healthy_count = 0
       @unhealthy_count = 0
 

metadata

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