ey_stonith 0.3.6 → 0.4.1.pre

data/spec/fixtures/config.yml

@@ -0,0 +1,11 @@
+---
+log: var/log/stonith.log
+state_dir: var/run/stonith
+success_path: var/run/stonith/success
+heartbeat: 1
+endpoint_uri: http://example.com/stonith
+endpoint_token: i-87654321
+endpoint_id: i-87654321
+monitor_host: localhost
+monitor_path: /chickity/check
+monitor_timeout: 10

data/spec/fixtures/empty.yml

@@ -0,0 +1 @@
+--- {}

data/spec/helpers.rb

@@ -0,0 +1,15 @@
+module Helpers
+  def start_server(config)
+    config_ru = File.dirname(__FILE__) + "/fixtures/#{config}.ru"
+    @server = RealWeb.start_server(config_ru)
+    server_hostname
+  end
+
+  def stop_server
+    @server.stop
+  end
+
+  def server_hostname
+    "127.0.0.1:#{@server.port}"
+  end
+end

data/spec/history_spec.rb

@@ -0,0 +1,58 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+describe EY::Stonith::History do
+  let(:path) { Pathname.new('tmp/history') }
+  before { path.delete if path.exist? }
+  subject { described_class.new(path) }
+
+  it "fails hard if is not a true history" do
+    lambda { described_class.new(path, 1) }.should raise_error
+  end
+
+  context "with 1 entry" do
+    before { subject << :one }
+
+    it "has that entry without arrows" do
+      subject.to_s.should == "one"
+    end
+
+    it "resets" do
+      subject.reset
+      subject.to_s.should == ""
+    end
+
+    it "doesn't duplicate entries" do
+      subject << :one
+      subject.to_s.should == "one"
+    end
+  end
+
+  context "with 2 entries" do
+    before { subject << :one << :two }
+
+    it "has both entries connected by an arrow" do
+      subject.to_s.should == "one -> two"
+    end
+
+    it "doesn't scrub duplicates that aren't adjacent" do
+      subject << :one
+      subject.to_s.should == "two -> one"
+    end
+  end
+
+  context "with 3 entries" do
+    before { subject << :one << :two << :three }
+
+    it "has latest 2 entries connected by an arrow" do
+      subject.to_s.should == "two -> three"
+    end
+  end
+
+  context "with more than 3 entries" do
+    before { Range.new(1, 10).each {|i| subject << i } }
+
+    it "has latest 2 entries connected by an arrow" do
+      subject.to_s.should == "9 -> 10"
+    end
+  end
+end

data/spec/rackapp_spec.rb

@@ -0,0 +1,100 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+class MockMapper
+  def initialize
+    @instances          = []
+    @gone_instances     = []
+    @takeovers_received = []
+    @notifies_received  = []
+  end
+  attr_reader :takeovers_received, :notifies_received
+
+  def token_for(instance_id)
+    if @instances.include?(instance_id)
+      "token-for-#{instance_id}"
+    else
+      "unknown-token"
+    end
+  end
+
+  def takeover(instance_id)
+    unless @gone_instances.include?(instance_id)
+      @takeovers_received << instance_id
+      true
+    else
+      false
+    end
+  end
+
+  def notify(instance_id)
+    @notifies_received << instance_id
+  end
+
+  def add_instance(instance_id)
+    @instances << instance_id
+  end
+
+  def make_instance_gone(instance_id)
+    @gone_instances << instance_id
+  end
+end
+
+describe EY::Stonith::Rackapp do
+  before do
+    @mapper = MockMapper.new
+    EY::Stonith.callback_module = @mapper
+
+    @client = Rack::Client.new { run EY::Stonith::Rackapp }
+  end
+
+  context "takeover requests" do
+    it "returns 200 when the takeover is accepted" do
+      @mapper.add_instance("my-instance")
+
+      response = @client.post "/takeover", {"label" => "my-instance", "token" => "token-for-my-instance"}
+
+      response.should be_successful
+      response.body.to_s.should == "{}"
+      @mapper.takeovers_received.should == ["my-instance"]
+    end
+
+    it "returns 410 when the instance is no longer around" do
+      @mapper.add_instance("my-instance")
+      @mapper.make_instance_gone("my-instance")
+      response = @client.post "/takeover", {"label" => "my-instance", "token" => "token-for-my-instance"}
+
+      response.status.should == 410
+      @mapper.takeovers_received.should be_empty
+    end
+
+    it "returns 410 when the token is invalid" do
+      @mapper.add_instance("my-instance")
+
+      response = @client.post "/takeover", {"label" => "my-instance", "token" => "invalid-token"}
+
+      response.status.should == 410
+      @mapper.takeovers_received.should be_empty
+    end
+  end
+
+  context "notify requests" do
+    it "returns 200 when the notify is accepted" do
+      @mapper.add_instance("my-instance")
+
+      response = @client.post "/notify", {"label" => "my-instance", "token" => "token-for-my-instance"}
+
+      response.should be_successful
+      response.body.to_s.should == "{}"
+      @mapper.notifies_received.should == ["my-instance"]
+    end
+
+    it "returns 403 when the token is invalid" do
+      @mapper.add_instance("my-instance")
+
+      response = @client.post "/notify", {"label" => "my-instance", "token" => "invalid-token"}
+
+      response.status.should == 403
+      @mapper.notifies_received.should be_empty
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,24 @@
+unless defined? Bundler
+  require 'rubygems'
+  require 'bundler'
+  Bundler.setup
+end
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require File.expand_path('../../lib/ey_stonith', __FILE__)
+
+require 'randexp'
+require 'rack/client'
+require 'helpers'
+
+Randexp::Dictionary.words
+Thread.abort_on_exception = true
+
+Spec::Runner.configure do |config|
+  config.include(Helpers)
+
+  def reset_history(path)
+    EY::Stonith::History.new(path).reset
+  end
+
+end

metadata

@@ -1,28 +1,32 @@
 --- !ruby/object:Gem::Specification 
 name: ey_stonith
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 961916000
+  prerelease: true
   segments: 
   - 0
-  - 3
-  - 6
-  version: 0.3.6
+  - 4
+  - 1
+  - pre
+  version: 0.4.1.pre
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
 - Larry Diehl
 - Martin Emde
+- Tim Carey-Smith
+- Jason Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 -07:00
+date: 2011-01-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,58 +35,197 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
   type: :runtime
-  name: json
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: sinatra
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
+        - 1
         - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: SystemTimer
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
         - 2
-        - 0
-        version: 0.2.0
-  requirement: *id002
+        version: "1.2"
   type: :runtime
-  name: fog
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: open4
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: aruba
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 23
         segments: 
-        - 1
         - 0
-        - 7
-        version: 1.0.7
-  requirement: *id003
-  type: :runtime
-  name: redis
+        - 3
+        - 2
+        version: 0.3.2
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: randexp
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
+  name: realweb
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 19
         segments: 
         - 0
-        - 9
-        - 6
-        version: 0.9.6
-  requirement: *id004
-  type: :runtime
-  name: sinatra
-description: Shoot The Other Node In The Head
+        - 1
+        - 4
+        version: 0.1.4
+  type: :development
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: rack-client
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id014
+description: Shoot The Other Node In The Head (with a nerf gun)
 email: awsmdev@engineyard.com
 executables: 
 - stonith
@@ -104,9 +247,39 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
-- lib/ey_stonith/address_stealer.rb
+- .gitignore
+- Gemfile
+- LICENSE
+- README.rdoc
+- Rakefile
+- bin/stonith
+- bin/stonith-check
+- bin/stonith-claim
+- bin/stonith-commands
+- bin/stonith-cron
+- bin/stonith-help
+- bin/stonith-info
+- bin/stonith-notify
+- bin/stonith-reset
+- bin/stonith-resume
+- bin/stonith-status
+- bin/stonith-stop
+- bin/stonith-takeover
+- ey_stonith.gemspec
+- features/check.feature
+- features/cron.feature
+- features/fixtures/dead.ru
+- features/fixtures/healthy.ru
+- features/help.feature
+- features/not_found.feature
+- features/notify.feature
+- features/resume.feature
+- features/steps/stonith_steps.rb
+- features/stop.feature
+- features/support/env.rb
+- lib/ey_stonith.rb
 - lib/ey_stonith/awsm_notifier.rb
-- lib/ey_stonith/check_recorder.rb
+- lib/ey_stonith/commands.rb
 - lib/ey_stonith/commands/abstract.rb
 - lib/ey_stonith/commands/check.rb
 - lib/ey_stonith/commands/claim.rb
@@ -121,28 +294,16 @@ files:
 - 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/rackapp.rb
-- lib/ey_stonith.rb
-- bin/stonith
-- bin/stonith-check
-- bin/stonith-claim
-- bin/stonith-commands
-- bin/stonith-cron
-- bin/stonith-help
-- bin/stonith-info
-- bin/stonith-notify
-- bin/stonith-reset
-- bin/stonith-resume
-- bin/stonith-status
-- bin/stonith-stop
-- bin/stonith-takeover
-- README.rdoc
-- LICENSE
+- spec/config_spec.rb
+- spec/fixtures/config.yml
+- spec/fixtures/empty.yml
+- spec/helpers.rb
+- spec/history_spec.rb
+- spec/rackapp_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://engineyard.com/cloud
 licenses: []
@@ -164,18 +325,37 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Shoot The Other Node In The Head
-test_files: []
-
+summary: Shoot The Other Node In The Head (with a nerf gun)
+test_files: 
+- features/check.feature
+- features/cron.feature
+- features/fixtures/dead.ru
+- features/fixtures/healthy.ru
+- features/help.feature
+- features/not_found.feature
+- features/notify.feature
+- features/resume.feature
+- features/steps/stonith_steps.rb
+- features/stop.feature
+- features/support/env.rb
+- spec/config_spec.rb
+- spec/fixtures/config.yml
+- spec/fixtures/empty.yml
+- spec/helpers.rb
+- spec/history_spec.rb
+- spec/rackapp_spec.rb
+- spec/spec_helper.rb

data/lib/ey_stonith/address_stealer.rb

@@ -1,40 +0,0 @@
-require 'fog'
-
-module EY
-  module Stonith
-    class AddressStealer
-      def self.fog(credentials) Fog::AWS::EC2.new(credentials) end
-
-      def initialize(server_id, ip, credentials)
-        @fog         = self.class.fog(credentials)
-        server       = @fog.servers.get(server_id)
-        main_address = @fog.addresses.get(ip)
-
-        @address = if !main_address.server_id
-          main_address
-        elsif server
-          address_for(server)
-        end
-      end
-
-      def associate(server_id)
-        server = @fog.servers.get(server_id)
-        #TODO: handle error
-        raise "Don't have any IPs to use!" unless @address
-        raise "Already have an IP" if address_for(server)
-        @address.server = server
-      end
-
-      def ip
-        @address.public_ip
-      end
-
-      private
-
-      def address_for(server)
-        @fog.addresses.detect{|addr| addr.server_id == server.id }
-      end
-    end
-  end
-end
-

data/lib/ey_stonith/check_recorder.rb

@@ -1,55 +0,0 @@
-module EY
-  module Stonith
-    class CheckRecorder
-      BAD_CHECK_MAX = 5
-
-      attr_reader :bad
-
-      def initialize(pathname)
-        @pathname = pathname
-        rehydrate
-      end
-      
-      def bad_check!(key)
-        reset_on_key_change(key)
-        log_bad_check
-        @bad += 1 if @seen_good
-        save
-      end
-
-      def good_check!(key)
-        @key, @bad, @seen_good = key, 0, true
-        save
-      end
-
-      def limit_exceeded?
-        @seen_good && @bad > BAD_CHECK_MAX
-      end
-
-      protected
-
-      def save
-        @pathname.open('w') { |f| f << Marshal.dump([@key, @bad, @seen_good]) }
-      end
-
-      def rehydrate
-        @key, @bad, @seen_good = Marshal.load(@pathname.read) if @pathname.readable?
-      end
-
-      def reset
-        @key, @bad, @seen_good = nil, 0, false
-      end
-
-      def reset_on_key_change(key)
-        unless @key == key
-          reset
-          @key = key
-        end
-      end
-
-      def log_bad_check
-        Stonith.logger.warn("Bad check against #{@key}. Seen good? #{@seen_good}")
-      end
-    end
-  end
-end

data/lib/ey_stonith/data.rb

@@ -1,11 +0,0 @@
-module EY
-  module Stonith
-    class Data < Struct.new(:hostname, :instance_id, :ip)
-      alias_method :key, :instance_id
-
-      def to_s
-        "[#{hostname.inspect}, #{instance_id.inspect}, #{ip.inspect}]"
-      end
-    end
-  end
-end