murakumo 0.3.5 → 0.3.6

data/README

@@ -19,39 +19,39 @@ https://bitbucket.org/winebarrel/murakumo
   shell> murakumo-install-init-script
   shell> /etc/init.d/murakumo configure
   shell> /etc/init.d/murakumo start
-  shell> dig @127.0.0.1 <any_hostname>
+  shell> dig @127.0.0.1 <hostname>
 
 == Example
 === display of a list of a record
 
   shell> mrkmctl -L
-  IP address       TTL     Priority  Activity  Hostname
-  ---------------  ------  --------  --------  ----------
-  10.11.12.13          60  Origin    Active    my-host
+  IP address       TTL     Priority  Weight  Activity  Hostname
+  ---------------  ------  --------  ------  --------  ----------
+  10.11.12.13          60  Origin         0  Active    my-host
 
 === addition of a record 
 
-  shell> mrkmctl -A foo.bar,300,master
+  shell> mrkmctl -A foo.bar,300,master,100
   shell> mrkmctl -L
-  IP address       TTL     Priority  Activity  Hostname
-  ---------------  ------  --------  --------  ----------
-  10.11.12.13          60  Origin    Active    my-host
-  10.11.12.13         300  Master    Active    foo.bar
+  IP address       TTL     Priority  Weight  Activity  Hostname
+  ---------------  ------  --------  ------  --------  ----------
+  10.11.12.13          60  Origin         0  Active    my-host
+  10.11.12.13         300  Master       100  Active    foo.bar
 
 === deletion of a record 
 
   shell> mrkmctl -D foo.bar
   shell> mrkmctl -L
-  IP address       TTL     Priority  Activity  Hostname
-  ---------------  ------  --------  --------  ----------
-  10.11.12.13          60  Origin    Active    my-host
+  IP address       TTL     Priority  Weight  Activity  Hostname
+  ---------------  ------  --------  ------  --------  ----------
+  10.11.12.13          60  Origin         0  Active    my-host
 
 === addition of a node
 
   shell> mrkmctl -a 10.11.12.14
   shell> mrkmctl -L
-  IP address       TTL     Priority  Activity  Hostname
-  ---------------  ------  --------  --------  ----------
-  10.11.12.13          60  Origin    Active    my-host
-  10.11.12.14          60  Origin    Active    other-host
+  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
 

data/etc/murakumo.server

@@ -72,6 +72,11 @@ max-ip-num: 8
 #domain: ap-northeast-1.compute.internal
 #enable-cache: true
 
+#name-includes: ^app-\d+$, ^db-\d+$
+#name-excludes: 
+#addr-includes: ^10\..*
+#addr-excludes: 
+
 #notification:
 #  host: my.smtp.server
 #  #port: 25
@@ -85,13 +90,13 @@ max-ip-num: 8
 #  #open_timeout: 30
 #  #read_timeout: 60
 
-# Ip address, hostname, ttl
+# ip address, hostname, ttl
 host: $ip_addr, $hostname, 60
 
-# alias hostname, ttl, master/secondary/backup
+# alias hostname, ttl, master/secondary/backup, weight
 #alias:
-#  - foo,60,master
-#  - bar,60,backup
+#  - foo,60,master,100
+#  - bar,60,backup,100
 
 #health-check:
 #  foo:

data/etc/murakumo.yml.example

@@ -12,6 +12,11 @@ max-ip-num: 8
 #domain: ap-northeast-1.compute.internal
 #enable-cache: true
 
+#name-includes: ^app-\d+$, ^db-\d+$
+#name-excludes: 
+#addr-includes: ^10\..*
+#addr-excludes: 
+
 #notification:
 #  host: my.smtp.server
 #  #port: 25
@@ -25,13 +30,13 @@ max-ip-num: 8
 #  #open_timeout: 30
 #  #read_timeout: 60
 
-# Ip address, hostname, ttl
+# ip address, hostname, ttl
 host: 10.11.12.13, my-host, 60
 
-# alias hostname, ttl, master/secondary/backup
+# alias hostname, ttl, master/secondary/backup, weight
 alias: 
-  - foo,60,master
-  - bar,60,master
+  - foo,60,master,100
+  - bar,60,master,100
 
 health-check:
   foo:

data/lib/cli/mrkmctl.rb

@@ -35,23 +35,23 @@ begin
                  end
 
       r[3] = priority
-      r[4] = (r[4] == Murakumo::ACTIVE ? 'Active' : 'Inactive')
+      r[5] = (r[5] == Murakumo::ACTIVE ? 'Active' : 'Inactive')
     end
 
     if arg.kind_of?(String)
-      # 引数がある場合はフィルタリング（TTLを除く）
-      records = records.select {|r| r.values_at(0, 1, 3, 4).any?{|i| i.to_s =~ /\A#{arg.to_s}/i } }
+      # 引数がある場合はフィルタリング（TTL、weightを除く）
+      records = records.select {|r| r.values_at(0, 1, 3, 5).any?{|i| i.to_s =~ /\A#{arg.to_s}/i } }
     end
 
     if records.empty?
       puts 'No macth'
     else
       puts <<-EOF
-IP address       TTL     Priority   Activity  Hostname
----------------  ------  ---------  --------  ----------
+IP address       TTL     Priority   Weight  Activity  Hostname
+---------------  ------  ---------  ------  --------  ----------
       EOF
       records.each do |r|
-        puts '%-15s  %6d  %-9s  %-8s  %s' % r.values_at(0, 2, 3, 4, 1)
+        puts '%-15s  %6d  %-9s  %6d  %-8s  %s' % r.values_at(0, 2, 3, 4, 5, 1)
       end
     end
 

data/lib/cli/mrkmctl_options.rb

@@ -9,12 +9,12 @@ def mrkmctl_parse_args
     desc 'displays a list of a record'
     option :list, '-L', '--list [SEARCH_PHRASE]'
 
-    desc 'adds or updates a record: <hostname>[,<TTL>[,{master|secondary|backup}]]'
+    desc 'adds or updates a record: <hostname>[,<TTL>[,{master|secondary|backup}[,<weight>]]]'
     option :add, '-A', '--add RECORD', :type => Array, :multiple => true do |value|
-      (1 <= value.length and value.length <= 3) or invalid_argument
+      (1 <= value.length and value.length <= 4) or invalid_argument
 
       value = value.map {|i| i.strip }
-      hostname, ttl, priority = value
+      hostname, ttl, priority, weight = value
 
       # hostname
       /\A[0-9a-z\.\-]+\Z/i =~ hostname or invalid_argument
@@ -26,6 +26,11 @@ def mrkmctl_parse_args
 
       # Priority
       priority.nil? or /\A(master|secondary|backup)\Z/i =~ priority or invalid_argument
+
+      # Weight
+      unless weight.nil? or (/\A\d+\Z/ =~ weight and weight.to_i > 0)
+        invalid_argument
+      end
     end
 
     desc 'deletes a record'
@@ -80,7 +85,7 @@ def mrkmctl_parse_args
       if options[:add]
         options[:add] = options[:add].map do |r|
           r = r.map {|i| i ? i.to_s.strip : i }
-          [nil, 60, 'master'].each_with_index {|v, i| r[i] ||= v }
+          [nil, 60, 'master', 100].each_with_index {|v, i| r[i] ||= v }
 
           priority = case r[2].to_s
                      when /master/i
@@ -92,9 +97,10 @@ def mrkmctl_parse_args
                      end
 
           [
-            r[0], # name
+            r[0],      # name
             r[1].to_i, # TTL
             priority,
+            r[3].to_i  # weight
           ]
         end
       end

data/lib/cli/murakumo_options.rb

@@ -47,12 +47,12 @@ def murakumo_parse_args
       end
     end # :host
 
-    desc 'resource record of an alias: <hostname>[,<TTL>[,{master|secondary|backup}]]'
+    desc 'resource record of an alias: <hostname>[,<TTL>[,{master|secondary|backup}[, <weight>]]]'
     option :aliases, '-A', '--alias RECORD', :type => Array, :multiple => true do |value|
-      (1 <= value.length and value.length <= 3) or invalid_argument
+      (1 <= value.length and value.length <= 4) or invalid_argument
 
       value = value.map {|i| i.strip }
-      hostname, ttl, priority = value
+      hostname, ttl, priority, weight = value
 
       # hostname
       /\A[0-9a-z\.\-]+\Z/ =~ hostname or invalid_argument
@@ -64,6 +64,11 @@ def murakumo_parse_args
 
       # Priority
       priority.nil? or /\A(master|secondary|backup)\Z/i =~ priority or invalid_argument
+
+      # Weight
+      unless weight.nil? or (/\A\d+\Z/ =~ weight and weight.to_i > 0)
+        invalid_argument
+      end
     end # :aliases
 
     desc 'ip address of a default resolver'
@@ -153,7 +158,7 @@ def murakumo_parse_args
 
       options[:aliases] = (options[:aliases] || []).map do |r|
         r = r.map {|i| i.to_s.strip }
-        [nil, 60, 'master'].each_with_index {|v, i| r[i] ||= v }
+        [nil, 60, 'master', 100].each_with_index {|v, i| r[i] ||= v }
 
         priority = case r[2].to_s
                    when /master/i
@@ -165,9 +170,10 @@ def murakumo_parse_args
                    end
 
         [
-          r[0], # name
+          r[0],      # name
           r[1].to_i, # TTL
           priority,
+          r[3].to_i, # weight
         ]
       end
 
@@ -204,7 +210,7 @@ def murakumo_parse_args
             end
           end
         end
-      end
+      end # health check
 
       # notification
       if options.config_file and (ntfc = options.config_file['notification'])
@@ -241,8 +247,19 @@ def murakumo_parse_args
 
         ntfc_h[:open_timeout] = ntfc['open_timeout'].to_i if ntfc['open_timeout']
         ntfc_h[:read_timeout] = ntfc['read_timeout'].to_i if ntfc['read_timeout']
-      end
-    end
+      end # notification
+
+      # {name,addr}-{includes,excludes}
+      if options.config_file
+        %w(name-includes name-excludes addr-includes addr-excludes).each do |key|
+          unless (reg_vals = (options.config_file[key] || '').strip).empty?
+            reg_vals = reg_vals.split(/\s*,\s*/).select {|i| not i.empty? }.map {|i| Regexp.new(i.strip, Regexp::IGNORECASE) }
+            options[key.gsub('-', '_').to_sym] = reg_vals
+          end
+        end
+      end # {name,addr}-{includes,excludes}
+
+    end # after
 
     error do |e|
       abort(e.message)

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 
   # Priority
   MASTER = 1

data/lib/srv/murakumo_cloud.rb

@@ -22,15 +22,15 @@ module Murakumo
       # リソースレコードからホストのアドレスとデータを取り出す
       host_data = options[:host]
       @address = host_data.shift
-      host_data.concat [ORIGIN, ACTIVE]
+      host_data.concat [ORIGIN, 0, ACTIVE]
       alias_datas = options[:aliases].map {|r| r + [ACTIVE] }
       @logger = options[:logger]
 
       # 名前は小文字に変換
       datas = ([host_data] + alias_datas).map do |i|
-        name, ttl, priority, activity = i
+        name, ttl, priority, weight, activity = i
         name = name.downcase
-        [name, ttl, priority, activity]
+        [name, ttl, priority, weight, activity]
       end
 
       # データベースを作成してレコードを更新
@@ -157,29 +157,38 @@ module Murakumo
         end
       end
 
-      records = list_records
+      records = list_records.select {|r| r[0] == @address }
 
       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')].join(',')
+        [r[1], r[2], (r[3] == MASTER ? 'master' : 'backup'), r[4]].join(',')
       end
 
       hash['alias'] = aliases unless aliases.empty?
 
-      if @options.config_file and @options.config_file['health-check']
-        hash['health-check'] = @options.config_file['health-check']
-      end
+      # 設定ファイルのみの項目
+      if @options.config_file
+        if @options.config_file['health-check']
+          hash['health-check'] = @options.config_file['health-check']
+        end
 
-      if @options.config_file and @options.config_file['notification']
-        hash['notification'] = @options.config_file['notification']
-      end
+        if @options.config_file['notification']
+          hash['notification'] = @options.config_file['notification']
+        end
+
+        %w(name-includes name-excludes addr-includes addr-excludes).each do |key|
+          if @options.config_file[key]
+            hash[key] = @options.config_file[key]
+          end
+        end
+      end # 設定ファイルのみの項目
 
       return hash
     end
 
     def list_records
-      columns = %w(ip_address name ttl priority activity)
+      columns = %w(ip_address name ttl priority weight activity)
 
       @db.execute(<<-EOS).map {|i| i.values_at(*columns) }
         SELECT #{columns.join(', ')} FROM records ORDER BY ip_address, name
@@ -191,9 +200,9 @@ module Murakumo
 
       # 名前は小文字に変換
       records = records.map do |i|
-        name, ttl, priority = i
+        name, ttl, priority, weight = i
         name = name.downcase
-        [name, ttl, priority]
+        [name, ttl, priority, weight]
       end
 
       @gossip.transaction do
@@ -213,6 +222,7 @@ module Murakumo
         # データを更新
         records = records.map {|r| r + [ACTIVE] }
         @gossip.data.concat(records)
+
       end # transaction
 
       # データベースを更新
@@ -327,7 +337,7 @@ module Murakumo
       return unless datas
 
       datas.each do |i|
-        name, ttl, priority, activity = i
+        name, ttl, priority, weight, activity = i
 
         # 名前は小文字に変換
         name = name.downcase
@@ -337,9 +347,9 @@ module Murakumo
           @logger.warn('same hostname as origin was found')
         end
 
-        @db.execute(<<-EOS, address, name, ttl, priority, activity)
-          REPLACE INTO records (ip_address, name, ttl, priority, activity)
-          VALUES (?, ?, ?, ?, ?)
+        @db.execute(<<-EOS, address, name, ttl, priority, weight, activity)
+          REPLACE INTO records (ip_address, name, ttl, priority, weight, activity)
+          VALUES (?, ?, ?, ?, ?, ?)
         EOS
       end
 
@@ -370,6 +380,15 @@ module Murakumo
     # Search of records
 
     def address_exist?(name)
+      # includes、excludesのチェック
+      if @options[:name_excludes] and @options[:name_excludes].any? {|r| r =~ name }
+        return false
+      end
+
+      if @options[:name_includes] and not @options[:name_includes].any? {|r| r =~ name }
+        return false
+      end
+
       # 名前は小文字に変換
       name = name.downcase
 
@@ -379,7 +398,7 @@ module Murakumo
       if @cache.nil?
         # キャッシュを設定していないときはいつもの処理
         @address_records = @db.execute(<<-EOS, name, ACTIVE) # シングルスレッドェ…
-          SELECT ip_address, ttl, priority FROM records
+          SELECT ip_address, ttl, priority, weight FROM records
           WHERE name = ? AND activity = ?
         EOS
       else
@@ -395,7 +414,7 @@ module Murakumo
 
           # 普通に検索
           @address_records = @db.execute(<<-EOS, name, ACTIVE) # シングルスレッドェ…
-            SELECT ip_address, ttl, priority FROM records
+            SELECT ip_address, ttl, priority, weight FROM records
             WHERE name = ? AND activity = ?
           EOS
 
@@ -405,13 +424,13 @@ module Murakumo
 
             # レコードはハッシュに変換する
             cache_records = @address_records.map do |i|
-              ip_address, ttl, priority = i.values_at('ip_address', 'ttl', 'priority')
+              ip_address, ttl, priority, weight = i.values_at('ip_address', 'ttl', 'priority', 'weight')
 
               if min_ttl.nil? or ttl < min_ttl
                 min_ttl = ttl
               end
 
-              {'ip_address' => ip_address, 'ttl' => ttl, 'priority' => priority}
+              {'ip_address' => ip_address, 'ttl' => ttl, 'priority' => priority, 'weight' => weight}
             end
 
             # 最小値をExpire期限として設定
@@ -458,6 +477,15 @@ module Murakumo
     def name_exist?(address)
       address = x_ip_addr(address)
 
+      # includes、excludesのチェック
+      if @options[:addr_excludes] and @options[:addr_excludes].any? {|r| r =~ address }
+        return false
+      end
+
+      if @options[:addr_includes] and not @options[:addr_includes].any? {|r| r =~ address }
+        return false
+      end
+
       # シングルスレッドェ…
       @name_records = @db.execute(<<-EOS, address, ACTIVE)
         SELECT name, ttl, priority FROM records
@@ -497,15 +525,32 @@ module Murakumo
 
     # 乱数でレコードをシャッフルする
     def shuffle_records(records)
-      # レコードが一件の時はそのまま返す
-      return records if records.length == 1
+      # レコードが1件以下の時はそのまま返す
+      return records if records.length <= 1
 
-      # 先頭のAレコードを決定
       max_ip_num = [records.length, @options[:max_ip_num]].min
-      first_index = rand(records.length)
 
-      # Aレコードを返す
-      (records + records).slice(first_index, 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
 
     # リソースレコードのデータベース作成
@@ -523,6 +568,7 @@ module Murakumo
           name       TEXT NOT NULL,
           ttl        INTEGER NOT NULL,
           priority   INTEGER NOT NULL, /* MASTER:1, BACKUP:0, ORIGIN:-1 */
+          weight     INTEGER NOT NULL, /* Origin:0, Other:>=1 */
           activity   INTEGER NOT NULL, /* Active:1, Inactive:0 */
           PRIMARY KEY (ip_address, name)
         )

data/lib/srv/murakumo_health_check_context.rb

@@ -28,7 +28,7 @@ module Murakumo
 
     # HTTPチェッカー
     def http_get(path, statuses = [200], port = 80, host = '127.0.0.1')
-      res = Net::HTTP.start('127.0.0.1', 80) do |http|
+      res = Net::HTTP.start(host, port) do |http|
         http.read_timeout = @options['timeout']
         http.get(path)
       end
@@ -73,7 +73,9 @@ module Murakumo
           sock = port_sock
         end
 
-        my = Mysql.new(host, user, passwd, db, port, sock)
+        my = Mysql.init
+        my.options(Mysql::OPT_CONNECT_TIMEOUT, @options['timeout'])
+        my.connect(host, user, passwd, db, port, sock)
         !!(my.respond_to?(:ping) ? my.ping : my.stat)
       rescue => e
         @logger.debug("#{@name}: #{e.message}")
@@ -86,7 +88,7 @@ module Murakumo
     rescue LoadError
     end
 
-    unless defined?(:mysql_check)
+    unless method_defined?(:mysql_check)
       begin
         require 'mysql2'
 
@@ -96,6 +98,7 @@ module Murakumo
           opts[:password] = passwd if passwd
           opts[:host]     = host if host
           opts[:database] = db if db
+          opts[:connect_timeout] = @options['timeout']
 
           if port_sock.kind_of?(Integer)
             opts[:port] = port_sock

data/lib/srv/murakumo_health_checker.rb

@@ -69,7 +69,7 @@ module Murakumo
       @cloud.gossip.transaction do
         @cloud.gossip.data.each do |i|
           # 名前の一致するデータを更新
-          i[3] = activity if i[0] == @name
+          i[4] = activity if i[0] == @name
         end
       end
 

data/lib/srv/murakumo_server.rb

@@ -92,6 +92,7 @@ module Murakumo
           # look up PTR record
           match(@@cloud.method(:name_exist?), :PTR) do |transaction|
             name, ttl = @@cloud.lookup_name(transaction.name)
+            name += ".#{@@options[:domain]}" if @@options[:domain]
             transaction.respond!(Resolv::DNS::Name.create("#{name}."), :ttl => ttl)
           end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 Z
+date: 2011-12-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubydns
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.1
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Murakumo is the internal DNS server which manages name information using a gossip protocol.