ey_stonith 0.1.4 → 0.1.5.pre

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ey_stonith
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  - pre
+  version: 0.1.5.pre
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -16,25 +17,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -07:00
+date: 2010-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fog
+  requirement: *id001
+  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -43,38 +43,12 @@ dependencies:
         - 0
         - 58
         version: 0.0.58
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
+  requirement: *id002
+  name: fog
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: em-http-request
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 7
-        version: 0.2.7
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: redis
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -83,42 +57,62 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  type: :runtime
-  version_requirements: *id005
+  requirement: *id003
+  name: redis
+  prerelease: false
 description: Shoot The Other Node In The Head
 email: awsmdev@engineyard.com
 executables: 
 - ey-monitor
-- ey-monitor-stop
-- ey-monitor-status
-- ey-monitor-resume
-- ey-monitor-reset
+- stonith
+- stonith-check
+- stonith-claim
+- stonith-cron
+- stonith-notify
+- stonith-reset
+- stonith-resume
+- stonith-status
+- stonith-stop
+- stonith-takeover
 extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
 - LICENSE
 files: 
-- lib/ey_stonith/abstract_master.rb
 - lib/ey_stonith/address_stealer.rb
 - lib/ey_stonith/awsm_notifier.rb
-- lib/ey_stonith/box.rb
 - lib/ey_stonith/check_recorder.rb
-- lib/ey_stonith/cli.rb
+- lib/ey_stonith/commands/abstract.rb
+- lib/ey_stonith/commands/check.rb
+- lib/ey_stonith/commands/claim.rb
+- lib/ey_stonith/commands/commands.rb
+- lib/ey_stonith/commands/cron.rb
+- lib/ey_stonith/commands/help.rb
+- lib/ey_stonith/commands/not_found.rb
+- lib/ey_stonith/commands/notify.rb
+- lib/ey_stonith/commands/reset.rb
+- lib/ey_stonith/commands/resume.rb
+- lib/ey_stonith/commands/status.rb
+- lib/ey_stonith/commands/stop.rb
+- lib/ey_stonith/commands/takeover.rb
+- lib/ey_stonith/commands.rb
 - lib/ey_stonith/config.rb
 - lib/ey_stonith/data.rb
 - lib/ey_stonith/database.rb
 - lib/ey_stonith/history.rb
-- lib/ey_stonith/local_master.rb
-- lib/ey_stonith/master.rb
-- lib/ey_stonith/meta_data.rb
-- lib/ey_stonith/slave.rb
 - lib/ey_stonith.rb
 - bin/ey-monitor
-- bin/ey-monitor-reset
-- bin/ey-monitor-resume
-- bin/ey-monitor-status
-- bin/ey-monitor-stop
+- bin/stonith
+- bin/stonith-check
+- bin/stonith-claim
+- bin/stonith-cron
+- bin/stonith-notify
+- bin/stonith-reset
+- bin/stonith-resume
+- bin/stonith-status
+- bin/stonith-stop
+- bin/stonith-takeover
 - README.rdoc
 - LICENSE
 has_rdoc: true
@@ -139,11 +133,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/lib/ey_stonith/abstract_master.rb

@@ -1,15 +0,0 @@
-require 'json'
-require 'json/ext'
-module EY
-  module Stonith
-    class AbstractMaster
-      private
-
-      # ips are elastic, do not cache!
-      def public_ip() meta_data('public-ipv4') end
-      def local_hostname() @local_hostname ||= meta_data("local-hostname") end
-
-      def meta_data(key) EY::Stonith.meta_data[key] end
-    end
-  end
-end

data/lib/ey_stonith/box.rb

@@ -1,61 +0,0 @@
-module EY
-  module Stonith
-    class Box
-      def initialize(config, history)
-        EY::Stonith.logger.info "Booting Stonith"
-
-        @config, @history = config, history
-        database = Database.new(@config)
-        @master  = Master.new(database, @config.master_hostname_from_dna)
-
-        trap("HUP") { stop }
-        trap("USR1") do
-          stop
-          EM.next_tick { start }
-        end
-      end
-
-      def start
-        if @master.local?
-          @local_master = LocalMaster.new(@config.notify_uri, @config.cloud_credentials)
-          @master.update @local_master.data
-          @history << :claim
-        else
-          @slave = Slave.new(self, @config.monitor_heartbeat)
-          @slave.monitor!(@master)
-          @history << :monitor
-        end
-      end
-
-      def try_takeover(master_unchanged)
-        @master.with_locked_data do |data|
-          if master_unchanged.call(data.key)
-            begin
-              Stonith.logger.info("Locked! Taking over.")
-              @slave = nil
-              @history << :takeover
-              @local_master = LocalMaster.new(@config.notify_uri, @config.cloud_credentials)
-              new_data = @local_master.takeover!(data.instance_id, data.ip)
-              @master.update new_data
-            ensure
-              @history << :done
-            end
-          else
-            Stonith.logger.info("Failed to grab lock, relenting.")
-            @slave.start!
-            @history << :relent
-          end
-        end
-      end
-
-      private
-
-      def stop
-        EM.next_tick {
-          @slave.stop! if @slave
-          @history << :stop
-        }
-      end
-    end
-  end
-end

data/lib/ey_stonith/cli.rb

@@ -1,138 +0,0 @@
-require 'eventmachine'
-require 'optparse'
-require 'pathname'
-
-module EY
-  module Stonith
-    class CLI
-      DEFAULT_FILES = {
-        :ey       => "/etc/.ey-cloud.yml",
-        :redis    => "/etc/redis.yml",
-        :dna      => "/etc/chef/dna.json",
-        :history  => "/var/run/ey-monitor.history",
-        :pid_path => "/var/run/ey-monitor.pid",
-        :log_path => "/var/log/ey-monitor.log",
-      }
-
-      def self.commands
-        @commands ||= Hash.new do |commands, command|
-          lambda {
-            puts "Command not found: #{command}"
-            puts @parser
-            exit(1)
-          }
-        end
-      end
-
-      def self.command(cmd,&block)
-        commands[cmd.to_sym] = block
-      end
-
-      command :start do
-        with_pid do
-          Stonith.meta_data = @options[:meta_data] if @options[:meta_data]
-          Stonith.logger = Logger.new(@config.log_path)
-          Stonith.logger.level = Logger::INFO
-          begin
-            EM.run { Box.new(@config, @history).start }
-          rescue Exception => e
-            Stonith.logger.info "#{e.class.to_s}: #{e.message}\n#{e.backtrace.join("\n")}"
-          end
-        end
-      end
-
-      command :stop do
-        system("kill -HUP #{get_pid}")
-        sleep(1) until @history.last == "stop"
-        puts "takeover" if @history.include?(:takeover)
-      end
-
-      command :resume do
-        system("kill -USR1 #{get_pid}")
-      end
-
-      command :status do
-        puts @history
-      end
-
-      command :reset do
-        Database.new(@config).reset
-        @history.reset
-      end
-
-      def initialize(command, argv)
-        parse!(argv)
-        @config = Config.new(@options[:ey], @options[:redis], @options[:dna], @options[:history], @options[:pid_path], @options[:log_path])
-        cmd = command ? command.to_sym : :start
-        @history = History.new(@config.history_path)
-        instance_eval(&self.class.commands[cmd.to_sym])
-      end
-
-      def with_pid
-        @config.pid_path.open('w') { |file| file << $$ }
-        yield
-        @config.pid_path.delete
-      end
-
-      def get_pid
-        @config.pid_path.read
-      end
-
-      def parse!(argv)
-        @options = DEFAULT_FILES
-        parser.parse!(argv)
-      end
-
-      def parser
-        @parser ||= OptionParser.new do |parser|
-          parser.banner = <<-USAGE
-Usage: ey-monitor [FLAGS] [COMMAND]
-
-COMMANDS
-  start  Begin monitoring (default).
-  stop   Safely stop running ey-monitor agents.
-         Reports shutdown status to stdout.
-         Exits with non-zero status if there is a problem.
-
-        USAGE
-
-          parser.separator "FLAGS"
-
-          parser.on('-e', '--ey [FILE]', "Path to the ey-cloud.yml file (default #{@options[:ey]})") do |ey|
-            @options[:ey] = Pathname.new(ey)
-          end
-
-          parser.on('-r', '--redis [FILE]', "Path to the redis.yml file (default #{@options[:redis]})") do |redis|
-            @options[:redis] = Pathname.new(redis)
-          end
-
-          parser.on('-d', '--dna [FILE]', "Path to the chef/dna.json file (default #{@options[:dna]})") do |dna|
-            @options[:dna] = Pathname.new(dna)
-          end
-
-          parser.on('-m', '--meta-data [FILE]', "Mocked AWS meta_data yaml file") do |path|
-            @options[:meta_data] = YAML.load_file(Pathname.new(path))
-          end
-
-          parser.on('-t', '--history [FILE]', "Location of stonith history file (default #{@options[:history]}") do |path|
-            @options[:history] = Pathname.new(path)
-          end          
-
-          parser.on('-p', '--pid [FILE]', "Location of stonith pid file (default #{@options[:pid_path]}") do |path|
-            @options[:pid_path] = Pathname.new(path)
-          end
-
-          parser.on('-l', '--log [FILE]', "Location of stonith log file (default #{@options[:log_path]}") do |path|
-            @options[:log_path] = Pathname.new(path)
-          end
-
-          parser.on_tail("-h", "--help", "Show this message") do
-            puts parser
-            exit
-          end
-        end
-      end
-    end
-  end
-end
-

data/lib/ey_stonith/local_master.rb

@@ -1,28 +0,0 @@
-require 'open-uri'
-require 'fog'
-
-module EY
-  module Stonith
-    class LocalMaster < AbstractMaster
-      def initialize(notify_uri, cloud_credentials)
-        @notify_uri, @cloud_credentials = notify_uri, cloud_credentials
-      end
-      alias hostname local_hostname
-
-      def takeover!(master_instance_id, master_ip)
-        address = AddressStealer.new(master_instance_id, master_ip, @cloud_credentials)
-        address.associate(instance_id)
-        AwsmNotifier.new(instance_id, @notify_uri, @cloud_credentials)
-        data(address.ip)
-      end
-
-      def data(ip = public_ip)
-        Data.new(hostname, instance_id, ip)
-      end
-
-      private
-
-      def instance_id() @instance_id ||= EY::Stonith.meta_data["instance-id"] end
-    end
-  end
-end

data/lib/ey_stonith/master.rb

@@ -1,37 +0,0 @@
-require 'ey_stonith'
-require 'eventmachine'
-require 'em-http'
-
-module EY
-  module Stonith
-    class Master < AbstractMaster
-      def initialize(database, hostname_from_dna)
-        @database, @hostname_from_dna = database, hostname_from_dna
-      end
-
-      def check(good, bad)
-        @database.with_data do |data|
-          http = EM::HttpRequest.new("http://#{data.hostname}/haproxy/monitor").get :timeout => 10
-          http.callback {
-            unless http.response_header.status == 200
-              bad.call data.key
-            else
-              good.call data.key
-            end
-          }
-          http.errback { bad.call data.key }
-        end
-      end
-
-      def local?() hostname == local_hostname end
-      def hostname() hostname_from_db || hostname_from_dna end
-      def with_locked_data(&block) @database.with_locked_data(&block) end
-      def update(data) @database.set(data) end
-
-      private
-
-      attr_reader :hostname_from_dna
-      def hostname_from_db() @database.with_data { |data| data.hostname } end
-    end
-  end
-end

data/lib/ey_stonith/meta_data.rb

@@ -1,11 +0,0 @@
-require 'open-uri'
-
-module EY
-  module Stonith
-    module MetaData
-      def self.[](key)
-        open("http://169.254.169.254/latest/meta-data/#{key}").read
-      end
-    end
-  end
-end

data/lib/ey_stonith/slave.rb

@@ -1,41 +0,0 @@
-module EY
-  module Stonith
-    class Slave
-      def initialize(box, heartbeat)
-        @box, @heartbeat = box, heartbeat
-      end
-
-      def monitor!(master)
-        return if @checking
-        Stonith.logger.info "Monitoring started"
-        @check_recorder = CheckRecorder.new
-        @checking = EM.add_periodic_timer(@heartbeat) { check(master) }
-      end
-
-      def stop!
-        if @checking
-          Stonith.logger.info "Stopped: Not monitoring until SIGUSR1 received"
-          @checking.cancel
-          @checking = nil
-        end
-      end
-
-      private
-
-      def check(master)
-        good = lambda { |master_key| @check_recorder.good_check!(master_key) }
-        bad  = lambda { |master_key|
-          @check_recorder.bad_check!(master_key)
-          takeover! if @check_recorder.limit_exceeded?
-        }
-        master.check(good, bad)
-      end
-
-      def takeover!
-        Stonith.logger.info("Trying to grab the lock for takeover")
-        stop!
-        @box.try_takeover(@check_recorder.method(:checking_key?))
-      end
-    end
-  end
-end