ey_cloud_server 1.0.1 → 1.1.1.pre5

data/lib/ey-flex/version.rb

@@ -1,3 +1,3 @@
 module EY::CloudServer
-  VERSION = '1.0.1'
+  VERSION = '1.1.1.pre5'
 end

data/lib/ey-flex.rb

@@ -4,12 +4,9 @@ require 'date'
 require 'digest'
 require 'net/http'
 require 'fileutils'
-require 'eventmachine'
-require 'em-http'
 require 'json/ext'
 require 'right_aws'
 require 'open-uri'
-require 'rest_client'
 require 'dbi'
 require 'zlib'
 require 'stringio'
@@ -29,9 +26,7 @@ end
 require lib_dir + '/big-brother'
 require lib_dir + '/backups'
 require lib_dir + '/bucket_minder'
-require lib_dir + '/ey-api'
 require lib_dir + '/mysql_database'
 require lib_dir + '/postgresql_database'
 require lib_dir + '/snapshot_minder'
-require lib_dir + '/stonith'
 require lib_dir + '/version'

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ey_cloud_server
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  prerelease: true
+  segments: 
+  - 1
+  - 1
+  - 1
+  - pre5
+  version: 1.1.1.pre5
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,75 +15,77 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 -08:00
+date: 2010-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: right_aws
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  requirement: *id001
+  name: json
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: open4
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  requirement: *id002
+  name: right_aws
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: aws-s3
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  requirement: *id003
+  name: open4
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: igrigorik-em-http-request
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  requirement: *id004
+  name: aws-s3
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rest-client
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 0
+        - 1
+        - 5
+        - pre
+        version: 0.1.5.pre
+  requirement: *id005
+  name: ey_stonith
+  prerelease: false
 description: Server side components for Engine Yard's cloud
 email: awsmdev@engineyard.com
 executables: 
 - eybackup
 - ey-snapshots
-- ey-monitor
 - ey-agent
 extensions: []
 
@@ -90,11 +98,9 @@ files:
 - lib/ey-flex/backups.rb
 - lib/ey-flex/big-brother.rb
 - lib/ey-flex/bucket_minder.rb
-- lib/ey-flex/ey-api.rb
 - lib/ey-flex/mysql_database.rb
 - lib/ey-flex/postgresql_database.rb
 - lib/ey-flex/snapshot_minder.rb
-- lib/ey-flex/stonith.rb
 - lib/ey-flex/version.rb
 - lib/ey-flex.rb
 has_rdoc: true
@@ -110,18 +116,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Server side components for Engine Yard's cloud

data/bin/ey-monitor

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../lib/ey-flex'
-
-EY::Stonith.run

data/lib/ey-flex/ey-api.rb

@@ -1,21 +0,0 @@
-module EyApi
-  def call_api(path, opts={})
-    JSON.parse(@rest["/api/#{path}"].post(@keys.merge(opts), {"Accept" => "application/json"}))
-  rescue RestClient::RequestFailed => e
-    case e.http_code
-    when 503
-      sleep 10 # Nanite, save us...
-      retry
-    else
-      raise "API call to Engine Yard failed with status #{e.http_code}."
-    end
-  end
-  
-  def get_envs
-    @_envs ||= call_api("environments")
-  end
-  
-  def get_json(instance_id)
-    call_api("json_for_instance", :instance_id => instance_id)
-  end
-end

data/lib/ey-flex/stonith.rb

@@ -1,190 +0,0 @@
-module EY
-  class Log
-    def self.write(str)
-      puts str
-      File.open("/root/ey-monitor2.log", "a") do |f|
-        f.write("#{str}\n")
-      end
-    end
-  end
-  
-  class Stonith
-    include EyApi
-
-    def self.run
-      opts = YAML::load(File.read("/etc/.mysql.backups.yml"))
-      opts.merge!(YAML::load(File.read("/etc/.ey-cloud.yml")))
-      EventMachine.run {
-        EY::Stonith.new(opts.merge(:heartbeat => 10))
-      }
-    end
-
-    def initialize(opts={})
-      Log.write "Starting up"
-      @opts = opts
-      @rest = RestClient::Resource.new(opts[:api])
-      @keys = {:aws_secret_id => @opts[:aws_secret_id], :aws_secret_key => @opts[:aws_secret_key]}
-      @bad_checks = 0
-      @seen_good_check = false
-      @ec2 = RightAws::Ec2.new(@opts[:aws_secret_id], @opts[:aws_secret_key])
-      @taking_over = false
-      get_local_json
-      get_master_from_json
-      setup_traps
-      start
-      am_i_master?
-    end
-    
-    def setup_traps
-      trap("HUP") { cancel_master_check_timer; Log.write "timer canceled, not monitoring until you wake me up again"}
-      trap("USR1") { EM.add_timer(600) { setup_master_check_timer unless am_i_master? }; Log.write "woke up, starting monitoring again in 10 minutes"}
-    end
-    
-    def get_mysql_handle
-      DBI.connect("DBI:Mysql:engineyard:#{@json['db_host']}", 'root', @opts[:dbpass])
-    end
-    
-    def try_lock(nodename)
-      Log.write("Trying to grab the lock for: #{nodename}")
-      db = get_mysql_handle
-      db.execute("begin")
-      res = db.execute("select master_lock from locks for update")
-      master = res.fetch[0]
-      res.finish
-      got_lock = false
-      if master == @master
-        got_lock = true
-        @master = "http://#{private_dns_name}/haproxy/monitor"
-        db.do("update locks set master_lock = '#{@master}'")
-      else
-        # new master, don't start monitoring till it comes up
-        @seen_good_check = false
-        @taking_over = false
-        @master = master
-        Log.write("Failed to grab lock, relenting: #{nodename}\nmaster is: #{@master}")
-        EM.add_timer(600) { Log.write "restarting monitoring"; setup_master_check_timer }
-      end
-      db.do("commit")
-      db.disconnect
-      got_lock
-    end
-    
-    def start
-      setup_master_check_timer
-      EM.add_periodic_timer(300) { get_local_json }
-    end
-    
-    def setup_master_check_timer
-      cancel_master_check_timer
-      unless self_monitor_url == @master
-        @check_master_timer = EventMachine::PeriodicTimer.new(@opts[:heartbeat]) { check_master }
-      end
-    end
-    
-    def cancel_master_check_timer
-      @check_master_timer && @check_master_timer.cancel
-    end
-    
-    def check_master
-      http = EventMachine::HttpRequest.new(@master).get :timeout => 10
-
-      http.callback {
-        unless http.response_header.status == 200
-          take_over_as_master
-        else
-          @seen_good_check = true
-          @bad_checks = 0
-        end
-        http.response_header.status
-      }
-      http.errback { |msg, err|
-        take_over_as_master
-      }
-    end
-    
-    def take_over_as_master
-      Log.write("Got a bad check: seen good check is #{@seen_good_check.inspect}")
-      @bad_checks += 1
-      if @bad_checks > 5 && @seen_good_check && !@taking_over
-        Log.write "I'm trying to take over!"
-        @taking_over = true
-        cancel_master_check_timer
-        if try_lock(private_dns_name)
-          Log.write("I got the lock!")
-          steal_ip
-          unless notify_awsm
-            timer = EventMachine::PeriodicTimer.new(5) { timer.cancel if notify_awsm }
-          end
-        end
-      end
-    end
-    
-    def am_i_master?
-      res = false
-      @ec2.describe_addresses.each do |desc|
-        res = true if (desc[:public_ip] == public_ip && desc[:instance_id] == instance_id)
-      end
-      if res
-        db = get_mysql_handle
-        db.execute("begin")
-        rows = db.execute("select master_lock from locks for update")
-        master = rows.fetch[0]
-        rows.finish
-        db.do("update locks set master_lock = '#{self_monitor_url}'")
-        @master = self_monitor_url
-        cancel_master_check_timer
-        db.do("commit")
-      end
-      res
-    end
-    
-    def notify_awsm
-      Log.write "Notifying awsm that I won"
-      res = call_api("promote_instance_to_master", :instance_id => instance_id)
-      case res['status']
-      when 'ok'
-        true
-      when 'already_promoted'
-        am_i_master?
-        EM.add_timer(600) { setup_master_check_timer unless am_i_master? }
-        true
-      else
-        false
-      end
-    end
-    
-    def instance_id
-      @instance_id ||= open("http://169.254.169.254/latest/meta-data/instance-id").read
-    end
-    
-    def private_dns_name
-      @private_dns_name ||= open("http://169.254.169.254/latest/meta-data/local-hostname").read
-    end
-    
-    def self_monitor_url
-      "http://#{private_dns_name}/haproxy/monitor"
-    end
-    
-    def steal_ip
-      if @ec2.disassociate_address(public_ip)
-        @ec2.associate_address(instance_id, public_ip)
-      end
-    end
-    
-    def public_ip
-      @public_ip ||= @json['master_app_server']['public_ip']
-    end
-    
-    def get_local_json
-      @json = JSON.parse(File.read("/etc/chef/dna.json"))
-    end
-    
-    def get_master_from_json
-      if host = @json['master_app_server']['private_dns_name']
-        @master = "http://#{host}/haproxy/monitor"
-      end
-    end
-    
-  end
-end
-