etcd-tools 0.2.9 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDUzOGVkNzk2YWIyNzhkY2Q1N2FhN2IwZGZiZDRhNjc1YWE3MDc2NA==
+    Yzc0YWVjZTY0ODdhOTA1NGE4YTAyMGI2MDk4NDc2YzVkYzk0ZWYwYg==
   data.tar.gz: !binary |-
-    NTQ1YWJkZWRkYTc4MDVlM2EyNjc1ZWRkNDc3NmQ3YzdkZGNlNjU5ZA==
+    M2JjMWVhOGIzZGRjMjMwOGYzODQ2ZmVkNTYzNjRhNGFkOTViOGY0Zg==
 SHA512:
   metadata.gz: !binary |-
-    YmRiYmZkNGEwM2E5NjFjMzFmM2RkZmE2MDExZTYzMTQzNTgwMmUzMGIzNTk1
-    YzRjYTkwMTg2NzU3Mjk3ODY2MGY1ZjVlNTdmZDE3ZjFlYzcwMDllNzI4NmY4
-    YTMyMGU1NWUwNTY3N2YzZDZhMDIxMjhlYjAwY2MzZmMwOTc4Mzk=
+    NTc3MTExOGFjY2M1NGM5YWM5NzVhYzcyYTAxZjgwMzQ1NDYzODEzYmZhNDdm
+    MWViYmZjMDE0NmJlZGIxNTUxN2Q1Yzc1ZWRhMDI0MDI3NWQyZmI3MDlmNzdh
+    ZGIzN2Y0NzNhZGUzNzk1NDg3YThmZTI4Yzk3MGZhOWFkYTc0NDk=
   data.tar.gz: !binary |-
-    NTg1YjcwZGFmOWU1NjM0NTQ1ODgzYjM3ZWFmYTI3MTk3OGEzMjQ0MTIyYjRk
-    ZWYzYmY4ZjkwOTYzNjkyZWY2ZGIyYWNlNGQ5M2QzNWRhMTVkNTJlMGRjNDll
-    NmVlNjU3OTEwNTBiOTU0YTlmZTk2MDU5MGUzZDkzMmQ2MjcwYjI=
+    NTQ2NzE2NmM3NjU2ZGNhOGVjYTVjYTcyMzkyYTk2ODFiYjNhZmFiYmRhOGY0
+    OWZhZTk0Y2E3OTM5MDkxYThkOTNiODEyYjhiOTE0YmQ4ZWRjN2RkMThhNDFj
+    MTNmNTUyZGE2ZmQzMWE4OTJiNzJiNWEzNzFhNjQzMzZkMWY3ZDk=

data/lib/etcd-tools/erb.rb

@@ -15,10 +15,9 @@ module EtcdTools
       end
       @etcd = etcd
       compiler = ::ERB::Compiler.new('-')
-      set_eoutvar(compiler, "_erbout")
+      set_eoutvar(compiler, '_erbout')
       @src, @enc = *compiler.compile(template)
       @filename = nil
-      # super template
     end
 
     def result
@@ -26,7 +25,7 @@ module EtcdTools
     end
 
     def value path
-      return @etcd.get('/' + path.sub(/^\//, '')).value
+      @etcd.get('/' + path.sub(/^\//, '')).value
     end
 
     def keys path
@@ -39,15 +38,13 @@ module EtcdTools
     end
 
     def hash path
-      begin
-        etcd2hash @etcd, path
-      rescue
-        {}
-      end
+      etcd2hash @etcd, path
+    rescue
+      {}
     end
 
     def members
-      Hash[ @etcd.members.map { |id, md| [ id, md.merge({ "ip" => md["clientURLs"].first.sub(/https?:\/\//, '').sub(/:[0-9]+/, '') }) ] } ]
+      Hash[ @etcd.members.map { |id, md| [ id, md.merge({ 'ip' => md['clientURLs'].first.sub(/https?:\/\//, '').sub(/:[0-9]+/, '') }) ] } ]
     end
 
   end

data/lib/etcd-tools/etcd.rb

@@ -3,7 +3,7 @@ require 'etcd-tools/mixins'
 
 module EtcdTools
   module Etcd
-    def etcd_connect (url)
+    def etcd_connect(url)
       (host, port) = url.gsub(/^https?:\/\//, '').gsub(/\/$/, '').split(':')
       etcd = ::Etcd.client(host: host, port: port)
       begin
@@ -14,36 +14,32 @@ module EtcdTools
       end
     end
 
-    def hash2etcd (etcd, hash, path="")
-      begin
-        hash.each do |key, value|
-          path = "" if path == '/'
-          etcd_key = path + '/' + key.to_s
-          if value.class == Hash
-            hash2etcd(etcd, value, etcd_key)
-          else
-            etcd.set(etcd_key, value: value)
-          end
+    def hash2etcd(etcd, hash, path = '')
+      hash.each do |key, value|
+        path = "" if path == '/'
+        etcd_key = path + '/' + key.to_s
+        if value.class == Hash
+          hash2etcd(etcd, value, etcd_key)
+        else
+          etcd.set(etcd_key, value: value)
         end
-      rescue Exception => e
-        raise e #fixme
       end
+    rescue Exception => e
+      raise e #fixme
     end
 
-    def etcd2hash (etcd, path="")
-      begin
-        h = {}
-        etcd.get(path).children.each do |child|
-          if etcd.get(child.key).directory?
-            h[child.key.split('/').last.to_s] = etcd2hash etcd, child.key
-          else
-            h[child.key.split('/').last.to_s] = child.value
-          end
+    def etcd2hash(etcd, path = '')
+      h = {}
+      etcd.get(path).children.each do |child|
+        if etcd.get(child.key).directory?
+          h[child.key.split('/').last.to_s] = etcd2hash etcd, child.key
+        else
+          h[child.key.split('/').last.to_s] = child.value
         end
-        return Hash[h.sort]
-      rescue Exception => e
-        return nil
       end
+      return Hash[h.sort]
+    rescue Exception => e
+      return nil
     end
   end
 end

data/lib/{etcd_tools.rb → etcd-tools.rb}

@@ -1,8 +1,6 @@
+require 'etcd-tools/mixins'
+
 module EtcdTools
   module Cli
   end
-
-  module Watchdog
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcd-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Radek 'blufor' Slavicinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd
@@ -30,32 +30,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: net-ping
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.8
-description: A set of handful daemons and command-line utils for ETCD (is part of
-  PortAuthority)
+description: A set of handful command-line utils for ETCD
 email: radek.slavicinsky@gmail.com
 executables:
-- etcd-watchdog-haproxy
-- etcd-watchdog-vip
 - etcd-erb
 - yaml2etcd
 - etcd2yaml
@@ -63,26 +40,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/etcd-erb
-- bin/etcd-watchdog-haproxy
-- bin/etcd-watchdog-vip
 - bin/etcd2yaml
 - bin/yaml2etcd
+- lib/etcd-tools.rb
 - lib/etcd-tools/cli/etcd2yaml.rb
 - lib/etcd-tools/cli/etcd_erb.rb
 - lib/etcd-tools/cli/yaml2etcd.rb
 - lib/etcd-tools/erb.rb
 - lib/etcd-tools/etcd.rb
 - lib/etcd-tools/mixins.rb
-- lib/etcd-tools/watchdog/haproxy.rb
-- lib/etcd-tools/watchdog/init.rb
-- lib/etcd-tools/watchdog/threads/etcd.rb
-- lib/etcd-tools/watchdog/threads/icmp.rb
-- lib/etcd-tools/watchdog/util/config.rb
-- lib/etcd-tools/watchdog/util/etcd.rb
-- lib/etcd-tools/watchdog/util/helpers.rb
-- lib/etcd-tools/watchdog/util/logger.rb
-- lib/etcd-tools/watchdog/vip.rb
-- lib/etcd_tools.rb
 homepage: https://github.com/blufor/etcd-tools
 licenses:
 - GPLv2

data/bin/etcd-watchdog-haproxy

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require 'etcd-tools/etcd_watchdog_haproxy'
-app = EtcdTools::Watchdog::HAproxy.new
-app.run

data/bin/etcd-watchdog-vip

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require 'etcd-tools/watchdog/vip'
-app = EtcdTools::Watchdog::Vip.new
-app.run

data/lib/etcd-tools/watchdog/haproxy.rb

@@ -1,23 +0,0 @@
-require 'etcd-tools/watchdog/init'
-# require 'etcd-tools/watchdogthreads/haproxy'
-require 'etcd-tools/erb'
-
-module EtcdTools
-  module Watchdog
-    class HAproxy < EtcdTools::Watchdog::Init
-
-      def run
-        while @etcd.watch(@config[:haproxy_cfg]) do
-
-        end
-      end
-
-      def generate_config
-      end
-
-      def reload_haproxy
-      end
-
-    end
-  end
-end

data/lib/etcd-tools/watchdog/init.rb

@@ -1,43 +0,0 @@
-require 'timeout'
-require 'json'
-require 'time'
-require 'etcd-tools/mixins'
-require 'etcd-tools/watchdog/util/config'
-require 'etcd-tools/watchdog/util/logger'
-require 'etcd-tools/watchdog/util/helpers'
-require 'etcd-tools/watchdog/util/etcd'
-require 'etcd-tools/watchdog/threads/etcd'
-
-module EtcdTools
-  module Watchdog
-    class Init
-
-      include EtcdTools::Watchdog::Util::Config
-      include EtcdTools::Watchdog::Util::Logger
-      include EtcdTools::Watchdog::Util::Helpers
-      include EtcdTools::Watchdog::Util::Etcd
-      include EtcdTools::Watchdog::Threads
-
-      def initialize
-        @config = { debug: false }
-        @config = config
-        @exit = false
-        @exit_sigs = ['INT', 'TERM']
-        @exit_sigs.each { |sig| Signal.trap(sig) { @exit = true } }
-        Signal.trap('USR1') { @config[:debug] = false }
-        Signal.trap('USR2') { @config[:debug] = true }
-        Signal.trap('HUP')  { @config = config }
-      end
-
-      def setup(proc_name, nice = -20)
-        if RUBY_VERSION >= '2.1'
-          Process.setproctitle(proc_name)
-        else
-          $0 = proc_name
-        end
-        Process.setpriority(Process::PRIO_PROCESS, 0, nice)
-        # TODO: Process.daemon ...
-      end
-    end
-  end
-end

data/lib/etcd-tools/watchdog/threads/etcd.rb

@@ -1,20 +0,0 @@
-module EtcdTools
-  module Watchdog
-    module Threads
-      def thread_etcd
-        Thread.new do
-          debug '<etcd> starting thread...'
-          etcd = etcd_connect!
-          while !@exit do
-            debug '<etcd> checking etcd state'
-            status = leader? etcd
-            @semaphore[:etcd].synchronize { @status_etcd = status }
-            debug "<etcd> i am #{status ? 'the leader' : 'not a leader' }"
-            sleep @config[:parameters][:etcd_interval]
-          end
-          info '<etcd> ending thread...'
-        end
-      end
-    end
-  end
-end

data/lib/etcd-tools/watchdog/threads/icmp.rb

@@ -1,22 +0,0 @@
-require 'net/ping'
-
-module EtcdTools
-  module Watchdog
-    module Threads
-      def thread_icmp
-        Thread.new do
-          debug '<icmp> starting thread...'
-          icmp = Net::Ping::ICMP.new(@config[:parameters][:vip])
-          while !@exit do
-            debug '<icmp> checking state by ping'
-            status = vip_alive? icmp
-            @semaphore[:icmp].synchronize { @status_icmp = status }
-            debug "<icmp> VIP is #{status ? 'alive' : 'down' }"
-            sleep @config[:parameters][:icmp_interval]
-          end
-          info '<icmp> ending thread...'
-        end
-      end
-    end
-  end
-end

data/lib/etcd-tools/watchdog/util/config.rb

@@ -1,43 +0,0 @@
-require 'yaml'
-require 'etcd-tools/mixins'
-
-module EtcdTools
-  module Watchdog
-    module Util
-      module Config
-        private
-        def default_config
-          { debug: false,
-            parameters: { interface: 'eth0',
-                          vip: '192.168.0.168',
-                          mask: '255.255.255.0',
-                          interval: 1,
-                          etcd_endpoint: 'http://127.0.0.1:4001',
-                          etcd_interval: 1,
-                          etcd_timeout: 5,
-                          icmp_count: 2,
-                          icmp_interval: 1,
-                          arping_count: 1,
-                          arping_wait: 1 },
-            commands: { arping: `which arping`.chomp,
-                        iproute: `which ip`.chomp,
-                        arp: `which arp`.chomp } }
-        end
-
-        def config
-          cfg = default_config
-          if File.exist? '/etc/etcd-watchdog.yaml'
-            cfg = cfg.deep_merge YAML.load_file('/etc/etcd-watchdog.yaml')
-            puts 'loaded config from /etc/etcd-watchdog.yaml'
-          elsif File.exist? './etcd-watchdog.yaml'
-            cfg = cfg.deep_merge YAML.load_file('./etcd-watchdog.yaml')
-            puts 'loaded config from ./etcd-watchdog.yaml'
-          else
-            puts 'no config file loaded, using defaults'
-          end
-          cfg
-        end
-      end
-    end
-  end
-end

data/lib/etcd-tools/watchdog/util/etcd.rb

@@ -1,34 +0,0 @@
-require 'etcd'
-
-module EtcdTools
-  module Watchdog
-    module Util
-      module Etcd
-        # connect to ETCD
-        def etcd_connect!
-          (host, port) = @config[:parameters][:etcd_endpoint].gsub(/^https?:\/\//, '').gsub(/\/$/, '').split(':')
-          etcd = ::Etcd.client(host: host, port: port)
-          begin
-            versions = JSON.parse(etcd.version)
-            info "<etcd> conncted to ETCD at #{@config[:parameters][:etcd_endpoint]}"
-            info "<etcd> server version: #{versions['etcdserver']}"
-            info "<etcd> cluster version: #{versions['etcdcluster']}"
-            info "<etcd> healthy: #{etcd.healthy?}"
-            return etcd
-          rescue Exception => e
-            err "<etcd> couldn't connect to etcd at #{host}:#{port}"
-            err "<etcd> #{e.message}"
-            @exit = true
-          end
-        end
-
-        # is my ETCD the leader?
-        # <IMPLEMENTED>
-        def leader?(etcd)
-          etcd.stats(:self)['id'] == etcd.stats(:self)['leaderInfo']['leader']
-        end
-
-      end
-    end
-  end
-end

data/lib/etcd-tools/watchdog/util/helpers.rb

@@ -1,25 +0,0 @@
-require 'socket'
-
-module EtcdTools
-  module Watchdog
-    module Util
-      module Helpers
-        def hostname
-          @hostname ||= Socket.gethostname
-        end
-
-        def arping
-          @config[:commands][:arping]
-        end
-
-        def iproute
-          @config[:commands][:iproute]
-        end
-
-        def arp
-          @config[:commands][:arp]
-        end
-      end
-    end
-  end
-end

data/lib/etcd-tools/watchdog/util/logger.rb

@@ -1,44 +0,0 @@
-require 'logger'
-
-module EtcdTools
-  module Watchdog
-    module Util
-      module Logger
-        def info(message)
-          if @config[:debug]
-            @semaphore[:log].synchronize do
-              $stdout.puts(Time.now.to_s + ' INFO  (TID:' + Thread.current.object_id.to_s + ') ' + message.to_s)
-              $stdout.flush
-            end
-          else
-            @semaphore[:log].synchronize do
-              $stdout.puts(Time.now.to_s + ' INFO  ' + message.to_s)
-              $stdout.flush
-            end
-          end
-        end
-
-        def err(message)
-          if @config[:debug]
-            @semaphore[:log].synchronize do
-              $stdout.puts(Time.now.to_s + ' ERROR (TID:' + Thread.current.object_id.to_s + ') ' + message.to_s)
-              $stdout.flush
-            end
-          else
-            @semaphore[:log].synchronize do
-              $stdout.puts(Time.now.to_s + ' ERROR ' + message.to_s)
-              $stdout.flush
-            end
-          end
-        end
-
-        def debug(message)
-          @semaphore[:log].synchronize do
-            $stdout.puts(Time.now.to_s + ' DEBUG (TID:' + Thread.current.object_id.to_s + ') ' + message.to_s)
-            $stdout.flush
-          end if @config[:debug]
-        end
-      end
-    end
-  end
-end

data/lib/etcd-tools/watchdog/vip.rb

@@ -1,170 +0,0 @@
-require 'ipaddr'
-require 'etcd-tools/watchdog/init'
-require 'etcd-tools/watchdog/threads/icmp'
-
-module EtcdTools
-  module Watchdog
-    class Vip < EtcdTools::Watchdog::Init
-
-      def run
-        if Process.euid != 0
-          $stderr.puts 'Must run under root user!'
-          exit! 1
-        end
-        setup 'etcd-vip-watchdog'
-        @semaphore = {
-          log: Mutex.new,
-          etcd: Mutex.new,
-          icmp: Mutex.new
-        }
-        @thread = { icmp: thread_icmp, etcd: thread_etcd }
-        @status_etcd = false
-        @status_icmp = false
-        @thread.each_value(&:run)
-        sleep @config[:parameters][:interval]
-        first_cycle = true
-        while !@exit do
-          status_etcd = status_icmp = false # FIXME: introduce CVs...
-          @semaphore[:icmp].synchronize { status_icmp = @status_icmp }
-          @semaphore[:etcd].synchronize { status_etcd = @status_etcd }
-          if status_etcd
-            if got_vip?
-              debug '<main> i am the leader with VIP, that is OK'
-            else
-              info '<main> i am the leader without VIP, checking whether it is free'
-              if status_icmp
-                info '<main> VIP is still up! (ICMP)'
-                # FIXME: notify by sensu client socket
-              else
-                info '<main> VIP is unreachable by ICMP, checking for duplicates on L2'
-                if vip_dup?
-                  info '<main> VIP is still assigned! (ARP)'
-                  # FIXME: notify by sensu client socket
-                else
-                  info '<main> VIP is free, assigning'
-                  vip_handle! status_etcd
-                  info '<main> updating other hosts about change'
-                  vip_update_arp!
-                end
-              end
-            end
-          else
-            if got_vip?
-              info '<main> i got VIP and should not, removing'
-              vip_handle! status_etcd
-              info '<main> updating other hosts about change'
-              vip_update_arp!
-            else
-              debug '<main> i am not a leader and i do not have the VIP, that is OK'
-            end
-          end
-          sleep @config[:parameters][:interval]
-          if first_cycle
-            @semaphore[:icmp].synchronize { status_icmp = @status_icmp }
-            @semaphore[:etcd].synchronize { status_etcd = @status_etcd }
-            info "<main> i #{status_etcd ? 'AM' : 'am NOT'} the leader"
-            info "<main> i #{got_vip? ? 'DO' : 'do NOT'} have the VIP"
-            info "<main> i #{status_icmp ? 'CAN' : 'CANNOT'} see the VIP"
-          end
-          first_cycle = false
-        end
-        info '<main> terminated!'
-        if got_vip?
-          info '<main> removing VIP'
-          vip_handle! false
-          vip_update_arp!
-        end
-        info '<main> stopping threads...'
-        @thread.each_value(&:join)
-        info '<main> exiting...'
-        exit 0
-      end
-
-      # add or remove VIP on interface
-      # <IMPLEMENTED>
-      def vip_handle!(leader)
-        ip = IPAddr.new(@config[:parameters][:vip])
-        mask = @config[:parameters][:mask]
-        cmd = [ iproute,
-                'address',
-                '',
-                "#{ip}/#{mask}",
-                'dev',
-                @config[:parameters][:interface],
-                'label',
-                @config[:parameters][:interface] + '-vip',
-                '>/dev/null 2>&1'
-              ]
-        leader ? cmd[2] = 'add' : cmd[2] = 'delete'
-        debug "<shell> #{cmd.join(' ')}"
-        if system(cmd.join(' '))
-          return true
-        else
-          return false
-        end
-      end
-
-      # send gratuitous ARP to the network
-      # <IMPLEMENTED>
-      def vip_update_arp!
-        cmd = [ arping, '-U', '-q',
-                '-c', @config[:parameters][:arping_count],
-                '-I', @config[:parameters][:interface],
-                @config[:parameters][:vip] ]
-        debug "<shell> #{cmd.join(' ')}"
-        if system(cmd.join(' '))
-          return true
-        else
-          return false
-        end
-      end
-
-      # check whether VIP is assigned to me
-      # <IMPLEMENTED>
-      def got_vip?
-        cmd = [ iproute,
-                'address',
-                'show',
-                'label',
-                "#{@config[:parameters][:interface]}-vip",
-                '|',
-                'grep',
-                '-q',
-                "#{@config[:parameters][:interface]}-vip"
-              ]
-        debug "<shell> #{cmd.join(' ')}"
-        if system(cmd.join(' '))
-          return true
-        else
-          return false
-        end
-      end
-
-      # check reachability of VIP by ICMP echo
-      # <--- REWORK
-      def vip_alive?(icmp)
-        (1..@config[:parameters][:icmp_count]).each { return true if icmp.ping }
-        return false
-      end
-
-      # check whether the IP is registered anywhere
-      #
-      def vip_dup?
-        cmd_arp = [ arp, '-d', @config[:parameters][:vip], '>/dev/null 2>&1' ]
-        cmd_arping = [  arping, '-D', '-q',
-                        '-c', @config[:parameters][:arping_count],
-                        '-w', @config[:parameters][:arping_wait],
-                        '-I', @config[:parameters][:interface],
-                        @config[:parameters][:vip] ]
-        debug "<shell> #{cmd_arp.join(' ')}"
-        system(cmd_arp.join(' '))
-        debug "<shell> #{cmd_arping.join(' ')}"
-        if system(cmd_arping.join(' '))
-          return false
-        else
-          return true
-        end
-      end
-    end
-  end
-end