murakumo 0.3.7 → 0.3.8

data/README

@@ -27,7 +27,7 @@ https://bitbucket.org/winebarrel/murakumo
   shell> mrkmctl -L
   IP address       TTL     Priority  Weight  Activity  Hostname
   ---------------  ------  --------  ------  --------  ----------
-  10.11.12.13          60  Origin         0  Active    my-host
+  10.11.12.13          60  Origin         -  Active    my-host
 
 === addition of a record 
 
@@ -35,7 +35,7 @@ https://bitbucket.org/winebarrel/murakumo
   shell> mrkmctl -L
   IP address       TTL     Priority  Weight  Activity  Hostname
   ---------------  ------  --------  ------  --------  ----------
-  10.11.12.13          60  Origin         0  Active    my-host
+  10.11.12.13          60  Origin         -  Active    my-host
   10.11.12.13         300  Master       100  Active    foo.bar
 
 === deletion of a record 
@@ -44,7 +44,7 @@ https://bitbucket.org/winebarrel/murakumo
   shell> mrkmctl -L
   IP address       TTL     Priority  Weight  Activity  Hostname
   ---------------  ------  --------  ------  --------  ----------
-  10.11.12.13          60  Origin         0  Active    my-host
+  10.11.12.13          60  Origin         -  Active    my-host
 
 === addition of a node
 
@@ -52,6 +52,6 @@ https://bitbucket.org/winebarrel/murakumo
   shell> mrkmctl -L
   IP address       TTL     Priority  Weight  Activity  Hostname
   ---------------  ------  --------  ------  --------  ----------
-  10.11.12.13          60  Origin         0  Active    my-host
-  10.11.12.14          60  Origin         0  Active    other-host
+  10.11.12.13          60  Origin         -  Active    my-host
+  10.11.12.14          60  Origin         -  Active    other-host
 

data/etc/murakumo.server

@@ -77,6 +77,18 @@ max-ip-num: 8
 #addr-includes: ^10\..*
 #addr-excludes: 
 
+#balancing:
+#  ^app-.*:                  # destination  alias regex
+#    algorithm:  random      # balancing algorithm
+#    max-ip-num: 1
+#  ^db-.*:                   # destination  alias regex
+#    algorithm:  fix_by_src  # balancing algorithm
+#    sources:    foo, bar    # source alias name
+#    max-ip-num: 8
+#  ^cache-.*:                # destination  alias regex
+#    algorithm:  fix_by_src2 # balancing algorithm
+#    sources:    zoo         # source alias name
+
 #notification:
 #  host: my.smtp.server
 #  #port: 25

data/etc/murakumo.yml.example

@@ -17,6 +17,18 @@ max-ip-num: 8
 #addr-includes: ^10\..*
 #addr-excludes: 
 
+#balancing:
+#  ^app-.*:                  # destination  alias regex
+#    algorithm:  random      # balancing algorithm
+#    max-ip-num: 1
+#  ^db-.*:                   # destination  alias regex
+#    algorithm:  fix_by_src  # balancing algorithm
+#    sources:    foo, bar    # source alias name
+#    max-ip-num: 8
+#  ^cache-.*:                # destination  alias regex
+#    algorithm:  fix_by_src2 # balancing algorithm
+#    sources:    zoo         # source alias name
+
 #notification:
 #  host: my.smtp.server
 #  #port: 25

data/lib/cli/murakumo_options.rb

@@ -259,6 +259,55 @@ def murakumo_parse_args
         end
       end # {name,addr}-{includes,excludes}
 
+      # balancing
+      if options.config_file and (balancing = options.config_file['balancing'])
+        balancing.kind_of?(Hash) or parse_error('configuration of a balancing is not right')
+        balancing_h = options[:balancing] = {}
+
+        balancing.map {|k, v| [k.to_s.strip.downcase, v] }.each do |dest, attrs|
+          if dest.empty? or attrs.empty?
+            parse_error('configuration of a balancing is not right', dest)
+          end
+
+          unless attrs.kind_of?(Hash)
+            parse_error('configuration of a balancing is not right', dest)
+          end
+
+          attrs_algorithm = (attrs['algorithm'] || 'random').strip.downcase
+          attrs_max_ip_num = attrs['max-ip-num']
+          attrs_sources = (attrs['sources'] || '').strip.split(/\s*,\s*/).map {|i| i.strip }
+
+          unless %w(random fix_by_src fix_by_src2).include?(attrs_algorithm)
+            parse_error('configuration of a balancing is not right', dest)
+          end
+
+          unless attrs_max_ip_num.nil? or (/\A\d+\Z/ =~ attrs_max_ip_num.to_s and attrs_max_ip_num.to_i > 0)
+            parse_error('configuration of a balancing is not right', dest)
+          end
+
+          unless attrs_sources.empty? or attrs_sources.all? {|i| /\A[0-9a-z\.\-]+\Z/ =~ i }
+            parse_error('configuration of a balancing is not right', dest)
+          end
+
+          reg_dest = Regexp.new(dest, Regexp::IGNORECASE)
+
+          attrs_h = {
+            :algorithm  => attrs_algorithm.to_sym,
+            :max_ip_num => (attrs_max_ip_num || options[:max_ip_num]).to_i
+          }
+
+          case attrs_algorithm
+          when 'random'
+            parse_error('configuration of a balancing is not right', dest) unless attrs_sources.empty?
+          when 'fix_by_src', 'fix_by_src2'
+            parse_error('configuration of a balancing is not right', dest) if attrs_sources.empty?
+            attrs_h[:sources] = attrs_sources
+          end
+
+          balancing_h[reg_dest] = attrs_h
+        end
+      end # balancing
+
     end # after
 
     error do |e|

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.3.7'
+  VERSION = '0.3.8'
 
   # Priority
   MASTER = 1

data/lib/srv/murakumo_balancer.rb

@@ -0,0 +1,135 @@
+require 'misc/murakumo_const'
+
+module Murakumo
+
+  class Balancer
+
+    def initialize(hash, address, db, logger)
+      @hash = hash
+      @address = address
+      @db = db
+      @logger = logger
+    end
+
+    def sort(records, max_ip_num, name)
+      # ハッシュが空ならランダムで
+      if @hash.nil? or @hash.empty?
+        return random(records, max_ip_num)
+      end
+
+      # 宛先を検索
+      dest, attrs = @hash.find {|k, v| k =~ name }
+
+      if dest.nil? or attrs.nil?
+        # 設定が見つからない場合はとりあえずランダムで
+        return random(records, max_ip_num)
+      end
+
+      algo = attrs[:algorithm]
+      max_ip_num = [(attrs[:max_ip_num] || max_ip_num), records.length].min
+      sources = attrs[:sources]
+
+      case algo
+      when :random
+        random(records, max_ip_num)
+      when :fix_by_src
+        fix_by_src(records, max_ip_num, sources)
+      when :fix_by_src2
+        fix_by_src2(records, max_ip_num, sources)
+      else
+        # 未対応のアルゴリズムの場合はとりあえずランダムで返す
+        @logger.warn("distribution setup which is not right: #{[dest, algo].inspect}")
+        random(records, max_ip_num)
+      end
+    end
+
+    private
+
+    # 重み付きランダム（デフォルト）
+    def random(records, max_ip_num)
+      indices = []
+      buf = []
+
+      # インデックスをWeight分追加
+      records.each_with_index do |r, i|
+        weight = r['weight']
+        weight.times { buf << i }
+      end
+
+      # インデックスをシャッフル
+      buf = buf.sort_by{ rand }
+
+      # ランダムにインデックスを取り出す
+      loop do
+        indices << buf.shift
+        indices.uniq!
+        break if (indices.size >= max_ip_num or buf.empty?)
+      end
+
+      # インデックスのレコードを返す
+      records.values_at(*indices)
+    end
+
+    def fix_by_src(records, max_ip_num, src_aliases)
+      fix_by_src0(records, max_ip_num, src_aliases) do |new_records|
+        # そのまま評価
+        new_records.slice(0, max_ip_num)
+      end
+    end
+
+    def fix_by_src2(records, max_ip_num, src_aliases)
+      fix_by_src0(records, max_ip_num, src_aliases) do |new_records|
+        # 先頭 + ランダムを返す
+        first = new_records.shift
+        [first] + new_records.slice(0, max_ip_num - 1).sort_by { rand }
+      end
+    end
+
+    # ソースで宛先を固定
+    def fix_by_src0(records, max_ip_num, src_aliases)
+      joined = src_aliases.map {|i| "'#{i.downcase}'" }.join(',')
+
+      # ソースエイリアスでIPアドレスを探す
+      sources = @db.execute(<<-EOS, ACTIVE).map {|i| i['ip_address'] }.sort
+        SELECT ip_address FROM records
+        WHERE name IN (#{joined}) AND activity = ?
+      EOS
+
+      # ソースが見つからない場合はとりあえずランダムで
+      if sources.empty?
+        @logger.warn("source is not found: #{src_aliases.join(',')}")
+        return random(records, max_ip_num)
+      end
+
+      # ソースが自分を含んでいない場合はとりあえずランダムで
+      unless sources.include?(@address)
+        @logger.warn("sources does not contain self: #{@address}")
+        return random(records, max_ip_num)
+      end
+
+      # 宛先をソート
+      dests = (0...records.length).map {|i| [records[i]['ip_address'], i] }.sort_by {|a, b| a }
+      dests_orig = dests
+
+      # 数をそろえる
+      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)
+      end
+
+      # 先頭を決めてローテート
+      first_index = sources.zip(dests).index {|s, d| s == @address }
+
+      unless first_index.zero?
+        dests = (dests_orig + dests_orig).slice(first_index, dests.length)
+      end
+
+      # 先頭インデックスからレコードを並べ直す
+      yield(records.values_at(*dests.map {|addr, i| i }))
+    end # fix_by_src0
+
+  end # Balancer
+
+end # Murakumo

data/lib/srv/murakumo_cloud.rb

@@ -3,6 +3,7 @@ require 'rgossip2'
 require 'sqlite3'
 
 require 'srv/murakumo_health_checker'
+require 'srv/murakumo_balancer'
 require 'misc/murakumo_const'
 
 module Murakumo
@@ -97,6 +98,9 @@ module Murakumo
 
       # キャッシュ
       @cache = {} if options[:enable_cache]
+
+      # バランサー
+      @balancer = Balancer.new(@options[:balancing], @address, @db, @logger)
     end
 
     # Control of service
@@ -182,6 +186,10 @@ module Murakumo
             hash[key] = @options.config_file[key]
           end
         end
+
+        if @options.config_file['balancing']
+          hash['balancing'] = @options.config_file['balancing']
+        end
       end # 設定ファイルのみの項目
 
       return hash
@@ -452,15 +460,21 @@ module Murakumo
         return @address_records.map {|i| i.values_at('ip_address', 'ttl') }
       end
 
+      # 名前は小文字に変換
+      name = name.downcase
+
+      # ドメインが指定されていたら削除
+      name.sub!(/\.#{Regexp.escape(@options[:domain])}\Z/i, '') if @options[:domain]
+
       # 優先度の高いレコードを検索
-      records = shuffle_records(@address_records.select {|i| i['priority'] == MASTER })
+      records = shuffle_records(@address_records.select {|i| i['priority'] == MASTER }, name)
 
       # 次に優先度の高いレコードを検索
-      records.concat(shuffle_records(@address_records.select {|i| i['priority'] == SECONDARY }))
+      records.concat(shuffle_records(@address_records.select {|i| i['priority'] == SECONDARY }, name))
 
       # レコードが見つからなかった場合はバックアップを選択
       if records.empty?
-        records = shuffle_records(@address_records.select {|i| i['priority'] == BACKUP })
+        records = shuffle_records(@address_records.select {|i| i['priority'] == BACKUP }, name)
       end
 
       # それでもレコードが見つからなかった場合はオリジンを選択
@@ -524,33 +538,14 @@ module Murakumo
     private
 
     # 乱数でレコードをシャッフルする
-    def shuffle_records(records)
+    def shuffle_records(records, name)
       # レコードが1件以下の時はそのまま返す
       return records if records.length <= 1
 
       max_ip_num = [records.length, @options[:max_ip_num]].min
 
-      indices = []
-      buf = []
-
-      # インデックスをWeight分追加
-      records.each_with_index do |r, i|
-        weight = r['weight']
-        weight.times { buf << i }
-      end
-
-      # インデックスをシャッフル
-      buf = buf.sort_by{ rand }
-
-      # ランダムにインデックスを取り出す
-      loop do
-        indices << buf.shift
-        indices.uniq!
-        break if (indices.size >= max_ip_num or buf.empty?)
-      end
-
-      # インデックスのレコードを返す
-      records.values_at(*indices)
+      # バランサーでソートする
+      @balancer.sort(records, max_ip_num, name)
     end
 
     # リソースレコードのデータベース作成

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-05 00:00:00 Z
+date: 2011-12-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubydns
@@ -101,6 +101,7 @@ files:
 - lib/cli/mrkmctl_options.rb
 - lib/cli/murakumo.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
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+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.