murakumo 0.1.0 → 0.1.1

data/README

@@ -12,14 +12,15 @@ https://bitbucket.org/winebarrel/murakumo
 
 * RubyDNS
 * SQLite
-* MessagePack
 
 == Install
 
-  gem install murakumo
-  cp /usr/local/lib/ruby/gems/1.8/gems/murakumo-*/etc/murakumo.server /etc/init.d/murakumo
-  chmod 755 /etc/init.d/murakumo
-  /etc/init.d/murakumo start
+  shell> gem install murakumo
+  shell> cp /usr/local/lib/ruby/gems/1.8/gems/murakumo-*/etc/murakumo.server /etc/init.d/murakumo
+  shell> chmod 755 /etc/init.d/murakumo
+  shell> /etc/init.d/murakumo configure
+  shell> /etc/init.d/murakumo start
+  shell> dig @127.0.0.1 <any_hostname>
 
 == Example
 === display of a list of a record

data/etc/murakumo.server

@@ -63,6 +63,8 @@ log-level: info
 resolver: $resolver
 max-ip-number: 8
 
+#initial-nodes: 10.11.12.14, 10.11.12.15
+
 host: $ip_addr, $hostname, 60
 
 #alias:

data/etc/murakumo.yml.sample

@@ -8,6 +8,8 @@ log-level: info
 resolver: 8.8.8.8
 max-ip-num: 8
 
+#initial-nodes: 10.11.12.14, 10.11.12.15
+
 # Ip address, hostname, ttl
 host: 10.11.12.13, my-host, 60
 
@@ -20,14 +22,14 @@ health-check:
   foo:
     interval: 5
     timeout: 5
-    healthy: 10
+    healthy: 2
     unhealthy: 2
     script: |
       tcp_check 80
   bar:
     interval: 5
     timeout: 5
-    healthy: 10
+    healthy: 2
     unhealthy: 2
     script: |
       http_get '/index.html'

data/lib/cli/mrkmctl.rb

@@ -26,12 +26,23 @@ begin
 
     puts <<-EOF
 IP address       TTL     Priority  Activity  Hostname
----------------  ------  --------  --------  ----------
+---------------  ------  ---------  --------  ----------
     EOF
     records.each do |r|
-      r[3] = (r[3] == Murakumo::ORIGIN ? 'Origin' : r[3] == Murakumo::MASTER ? 'Master' : 'Backup')
+      priority = case r[3]
+                 when Murakumo::ORIGIN
+                   'Origin'
+                 when Murakumo::MASTER
+                   'Master'
+                 when Murakumo::SECONDARY
+                   'Secondary'
+                 else
+                   'Backup'
+                 end
+
+      r[3] = priority
       r[4] = (r[4] == Murakumo::ACTIVE ? 'Active' : 'Inactive')
-      puts '%-15s  %6d  %-8s  %-8s  %s' % r.values_at(0, 2, 3, 4, 1)
+      puts '%-15s  %6d  %-9s  %-8s  %s' % r.values_at(0, 2, 3, 4, 1)
     end
 
   # レコードの追加・更新

data/lib/cli/mrkmctl_options.rb

@@ -9,11 +9,12 @@ def mrkmctl_parse_args
     desc 'displays a list of a record'
     option :list, '-L', '--list [NAME]'
 
-    desc 'adds or updates a record: <hostname>[,<TTL>[,{master|backup}]]'
+    desc 'adds or updates a record: <hostname>[,<TTL>[,{master|secondary|backup}]]'
     option :add, '-A', '--add RECORD', :type => Array, :multiple => true do |value|
       (1 <= value.length and value.length <= 3) or invalid_argument
 
-      hostname, ttl, master_backup = value
+      value = value.map {|i| i.strip }
+      hostname, ttl, priority = value
 
       # hostname
       /\A[0-9a-z\.\-]+\Z/i =~ hostname or invalid_argument
@@ -23,8 +24,8 @@ def mrkmctl_parse_args
         invalid_argument
       end
 
-      # MASTER or BACKUP
-      master_backup.nil? or /\A(master|backup)\Z/i =~ master_backup or invalid_argument
+      # Priority
+      priority.nil? or /\A(master|secondary|backup)\Z/i =~ priority or invalid_argument
     end
 
     desc 'deletes a record'
@@ -75,10 +76,19 @@ def mrkmctl_parse_args
           r = r.map {|i| i ? i.to_s.strip : i }
           [nil, 60, 'master'].each_with_index {|v, i| r[i] ||= v }
 
+          priority = case r[2].to_s
+                     when /master/i
+                       Murakumo::MASTER
+                     when /secondary/i
+                       Murakumo::SECONDARY
+                     else
+                       Murakumo::BACKUP
+                     end
+
           [
             r[0], # name
             r[1].to_i, # TTL
-            ((/master/i =~ r[2].to_s) ? Murakumo::MASTER : Murakumo::BACKUP),
+            priority,
           ]
         end
       end

data/lib/cli/murakumo_options.rb

@@ -22,6 +22,7 @@ def murakumo_parse_args
 
     desc 'initial node list of gossip protocols'
     option :initial_nodes, '-i', '--initial-nodes IP_LIST', :type => Array, :default => [] do |value|
+      value = value.map {|i| i.strip }
       value.all? {|i| /\A\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\Z/ =~ i } or invalid_argument
     end
 
@@ -29,6 +30,7 @@ def murakumo_parse_args
     option :host, '-H', '--host RECORD', :type => Array, :required => true do |value|
       (1 <= value.length and value.length <= 3) or invalid_argument
 
+      value = value.map {|i| i.strip }
       ip_addr, hostname, ttl = value
 
       # ip address
@@ -43,11 +45,12 @@ def murakumo_parse_args
       end
     end # :host
 
-    desc 'resource record of an alias: <hostname>[,<TTL>[,{master|backup}]]'
+    desc 'resource record of an alias: <hostname>[,<TTL>[,{master|secondary|backup}]]'
     option :aliases, '-A', '--alias RECORD', :type => Array, :multiple => true do |value|
       (1 <= value.length and value.length <= 3) or invalid_argument
 
-      hostname, ttl, master_backup = value
+      value = value.map {|i| i.strip }
+      hostname, ttl, priority = value
 
       # hostname
       /\A[0-9a-z\.\-]+\Z/ =~ hostname or invalid_argument
@@ -57,12 +60,14 @@ def murakumo_parse_args
         invalid_argument
       end
 
-      # MASTER or BACKUP
-      master_backup.nil? or /\A(master|backup)\Z/i =~ master_backup or invalid_argument
+      # Priority
+      priority.nil? or /\A(master|secondary|backup)\Z/i =~ priority or invalid_argument
     end # :aliases
 
     desc 'ip address of a default resolver'
     option :resolver, '-r', '--resolver IP_LIST', :type => Array  do |value|
+      value = value.map {|i| i.strip }
+
       unless value.all? {|i| /\A\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\Z/ =~ i }
         invalid_argument
       end
@@ -135,10 +140,19 @@ def murakumo_parse_args
         r = r.map {|i| i.to_s.strip }
         [nil, 60, 'master'].each_with_index {|v, i| r[i] ||= v }
 
+        priority = case r[2].to_s
+                   when /master/i
+                     Murakumo::MASTER
+                   when /secondary/i
+                     Murakumo::SECONDARY
+                   else
+                     Murakumo::BACKUP
+                   end
+
         [
           r[0], # name
           r[1].to_i, # TTL
-          ((/master/i =~ r[2].to_s) ? Murakumo::MASTER : Murakumo::BACKUP),
+          priority,
         ]
       end
 

data/lib/misc/murakumo_const.rb

@@ -1,8 +1,9 @@
 module Murakumo
   # Priority
   MASTER = 1
-  BACKUP = 0
-  ORIGIN = -1
+  SECONDARY = 0
+  BACKUP = -1
+  ORIGIN = -65536
 
   # Activity
   ACTIVE = 1

data/lib/srv/murakumo_cloud.rb

@@ -353,23 +353,26 @@ module Murakumo
 
       if @address_records.length == 1
         # レコードが一件ならそれを返す
-        records = @address_records
-      else
-        # 優先度の高いレコードを検索
-        records = @address_records.select {|i| i['priority'] == MASTER }
+        return @address_records.map {|i| i.values_at('ip_address', 'ttl') }
+      end
 
-        # レコードが見つからなかった場合は優先度の低いレコードを選択
-        if records.empty?
-          records = @address_records.select {|i| i['priority'] == BACKUP }
-        end
+      # 優先度の高いレコードを検索
+      records = shuffle_records(@address_records.select {|i| i['priority'] == MASTER })
 
-        # それでもレコードが見つからなかった場合はオリジンを選択
-        # ※このパスは通らない
-        records = @address_records if records.empty?
+      # 次に優先度の高いレコードを検索
+      records.concat(shuffle_records(@address_records.select {|i| i['priority'] == SECONDARY }))
+
+      # レコードが見つからなかった場合はバックアップを選択
+      if records.empty?
+        records = shuffle_records(@address_records.select {|i| i['priority'] == BACKUP })
       end
 
+      # それでもレコードが見つからなかった場合はオリジンを選択
+      # ※このパスは通らない
+      records = @address_records if records.empty?
+
       # IPアドレス、TTLを返す
-      return records.map {|i| i.values_at('ip_address', 'ttl') }
+      records.map {|i| i.values_at('ip_address', 'ttl') }
     ensure
       # エラー検出のため、一応クリア
       @address_records = nil
@@ -415,6 +418,19 @@ module Murakumo
 
     private
 
+    # 乱数でレコードをシャッフルする
+    def shuffle_records(records)
+      # レコードが一件の時はそのまま返す
+      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)
+    end
+
     # リソースレコードのデータベース作成
     # もう少し並列処理に強いストレージに変えたいが…
     def create_database

data/lib/srv/murakumo_health_checker_context.rb

@@ -28,6 +28,38 @@ module Murakumo
       return false
     end
 
+    # MySQLのドライバがあれば、MySQLチェッカーを定義
+    has_mysql = false
+
+    begin
+      require 'mysql'
+      has_mysql = true
+    rescue LoadError
+      begin
+        require 'mysql2'
+        has_mysql = true
+      rescue LoadError
+      end
+    end
+
+    if has_mysql
+      def mysql_check(user, passwd = nil, port_sock = 3306, host = '127.0.0.1', db = nil)
+        port = nil
+        sock = nil
+
+        if port_sock.kind_of?(Integer)
+          port = port_sock
+        else
+          sock = port_sock
+        end
+
+        my = Mysql.new(host, user, passwd, db, port, sock)
+        !!(my.respond_to?(:ping) ? my.ping : my.stat)
+      rescue
+        false
+      end
+    end
+
   end # HealthCheckerContext
 
 end # Murakumo

data/lib/srv/murakumo_server.rb

@@ -66,12 +66,7 @@ module Murakumo
           match(@@cloud.method(:address_exist?), :A) do |transaction|
             records = @@cloud.lookup_addresses(transaction.name)
 
-            # 先頭のAレコードを決定
-            max_ip_num = [records.length, @@options[:max_ip_num]].min
-            first_index = rand(max_ip_num);
-
-            # Aレコードを返す
-            (records + records).slice(first_index, max_ip_num).each do |r|
+            records.each do |r|
               address, ttl = r
               transaction.respond!(address, :ttl => ttl)
             end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 Z
+date: 2011-11-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubydns
@@ -39,7 +39,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 17
         segments: 
@@ -55,14 +55,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 21
         segments: 
         - 0
+        - 2
         - 1
-        - 9
-        version: 0.1.9
+        version: 0.2.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency