ey_stonith 0.2.1 → 0.3.0

data/lib/ey_stonith/awsm_notifier.rb

@@ -6,8 +6,8 @@ require 'timeout'
 module EY
   module Stonith
     class AwsmNotifier
-      def initialize(instance_id, uri, credentials)
-        @instance_id, @uri, @credentials = instance_id, uri, credentials
+      def initialize(instance_id, uri, token)
+        @instance_id, @uri, @token = instance_id, uri, token
       end
 
       def notify(success, unreachable, refused)
@@ -17,11 +17,9 @@ module EY
 
         case code
         when 200...300
-          if JSON.parse(body)['status'] == 'ok'
-            success.call
-          else
-            refused.call body
-          end
+          success.call
+        when 410
+          refused.call body
         else
           unreachable.call
         end
@@ -45,10 +43,10 @@ module EY
       end
 
       def payload
-        @credentials.merge('instance_id' => @instance_id)
+        {'label' => @instance_id, 'token' => @token}
       end
 
-      # ripped from restclient so we can use eventmachine
+      # ripped from restclient
       def process_payload(payload = nil, parent_key = nil)
         payload.keys.map do |k|
           key = parent_key ? "#{parent_key}[#{k}]" : k

data/lib/ey_stonith/commands/check.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 module EY
   module Stonith
     module Commands
@@ -18,7 +20,9 @@ module EY
             history << :check
 
             begin
-              open("http://#{data.hostname}#{config.monitor_path}").read
+              timeout(config.monitor_timeout) do
+                open("http://#{data.hostname}#{config.monitor_path}").read
+              end
             rescue
               bad_check(data.key, data.instance_id)
             else

data/lib/ey_stonith/commands/notify.rb

@@ -20,7 +20,7 @@ module EY
           notify_path.delete if notify_path.exist?
 
           database.with_data do |data|
-            abort_if_master(data.hostname)
+            abort_if_master data.hostname
             notify!
           end
 
@@ -50,8 +50,8 @@ If you want to (destructively) notify AWSM that this instance is master, call wi
         end
 
         def notify!
-          notifier = AwsmNotifier.new(config.meta_data_id, config.notify_uri, config.awsm_credentials)
-          notifier.notify(method(:success), method(:unreachable), method(:refused))
+          notifier = AwsmNotifier.new config.meta_data_id, config.takeover_uri, config.endpoint_token
+          notifier.notify method(:success), method(:unreachable), method(:refused)
         end
 
         def success
@@ -74,7 +74,7 @@ If you want to (destructively) notify AWSM that this instance is master, call wi
         end
 
         def parser
-          super.on('-f', '--force', "Force the command (only applicable to claim currently)") do |f|
+          super.on '-f', '--force', "Force the command (only applicable to claim currently)" do |f|
             @force = f
           end
           super

data/lib/ey_stonith/config.rb

@@ -27,10 +27,12 @@ module EY
         'log'        => '/var/log/stonith.log',
         'state_dir'  => '/var/run/stonith',
         'heartbeat'  => 10,
-        'notify_uri' => nil,
+        'endpoint_uri' => nil,
+        'endpoint_token' => nil,
 
         'monitor_host' => nil,
         'monitor_path' => '/haproxy/monitor',
+        'monitor_timeout' => 5,
 
         'redis_host' => nil,
         'redis_port' => 6379,
@@ -69,7 +71,9 @@ Config:
   history_path:  #{history_path}
   takeover_path: #{takeover_path}
 
-  notify_uri: #{notify_uri}
+  endpoint_uri: #{endpoint_uri}
+  endpoint_token: #{endpoint_token}
+  takeover_uri: #{takeover_uri}
   fog_credentials: #{fog_credentials.inspect}
   awsm_credentials: #{awsm_credentials.inspect}
 
@@ -79,6 +83,7 @@ Config:
 
   monitor_host: #{monitor_host}
   monitor_path: #{monitor_path}
+  monitor_timeout: #{monitor_timeout}
 
   redis_host: #{redis_host}
   redis_port: #{redis_port}
@@ -96,7 +101,12 @@ Config:
       def notify_path()   state_path + 'notify' end
       def history_path()  state_path + 'history' end
       def takeover_path() state_path + 'takeover' end
-      def notify_uri()    URI.parse(method_missing('notify_uri')) end
+      def endpoint_uri()  URI.parse(method_missing('endpoint_uri')) end
+      def takeover_uri
+        result = endpoint_uri
+        result.path << TAKEOVER_PATH
+        result
+      end
 
       def meta_data_hostname() @data['meta_data_hostname'] ||= meta_data('local-hostname') end
       def meta_data_id()       @data['meta_data_id'] ||= meta_data('instance-id') end

data/lib/ey_stonith/rackapp.rb

@@ -0,0 +1,30 @@
+require 'sinatra/base'
+require 'json'
+
+module EY
+  module Stonith
+    class Rackapp < Sinatra::Base
+      before { content_type :json }
+      get('/') { {}.to_json }
+
+      get HEALTH_PATH do
+        unless EY::Stonith.healthy?
+          status 503
+        end
+        {}.to_json
+      end
+
+      post TAKEOVER_PATH do
+        unless EY::Stonith.takeover(label, token)
+          status 410
+        end
+        {}.to_json
+      end
+
+      private
+
+      def label() params['label'] end
+      def token() params['token'] end
+    end
+  end
+end

data/lib/ey_stonith.rb

@@ -20,10 +20,34 @@ module EY
     autoload :LocalMaster,    'ey_stonith/local_master'
     autoload :Master,         'ey_stonith/master'
     autoload :MetaData,       'ey_stonith/meta_data'
+    autoload :Rackapp,        'ey_stonith/rackapp'
     autoload :Slave,          'ey_stonith/slave'
 
-    def self.log_to(io) @@logger = Logger.new(io) end
+    HEALTH_PATH   = '/health'   unless defined? HEALTH_PATH
+    TAKEOVER_PATH = '/takeover' unless defined? TAKEOVER_PATH
+
+    def self.log_to(io) @@logger = Logger.new io end
     def self.logger() @@logger end
+
+    ### For Rackapp ###
+
+    def self.healthy?() callback_module.healthy? end
+
+    def self.takeover(label, token)
+      if valid? label, token
+        callback_module.takeover label
+      end
+    end
+
+    def self.valid?(label, token)
+      token_for(label) == token
+    end
+
+    def self.token_for(label)
+      callback_module.token_for label
+    end
+
+    class << self; attr_accessor :callback_module end
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -07:00
+date: 2010-05-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,20 @@ dependencies:
   name: redis
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 6
+        version: 0.9.6
+  requirement: *id004
+  name: sinatra
+  prerelease: false
+  type: :runtime
 description: Shoot The Other Node In The Head
 email: awsmdev@engineyard.com
 executables: 
@@ -103,6 +117,7 @@ files:
 - 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