ey_cloud_server 1.1.1.pre7 → 1.2.0

data/bin/ey-snapshots

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

data/lib/ey-flex.rb

@@ -7,6 +7,7 @@ require 'fileutils'
 require 'json/ext'
 require 'right_aws'
 require 'open-uri'
+require 'rest_client'
 require 'dbi'
 require 'zlib'
 require 'stringio'
@@ -26,6 +27,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'

data/lib/ey-flex/backups.rb

@@ -70,6 +70,10 @@ module EY::Flex
           options[:index] = index
         end
 
+        opts.on("-q", "--quiet", "Supress output to STDOUT") do
+          options[:quiet] = true
+        end
+
       end
 
       opts.parse!(args)
@@ -81,7 +85,7 @@ module EY::Flex
 
       case options[:command]
       when :list
-        eyb.list options[:db], true
+        eyb.list options[:db]
       when :new_backup
         eyb.new_backup
       when :download
@@ -91,13 +95,13 @@ module EY::Flex
       end
       eyb.cleanup
     rescue EY::Flex::Error => e
-      $stderr.puts e.message
-      exit 1
+      abort e.message
     end
 
     ENGINES = {}
 
     def initialize(options = {})
+      @quiet = options[:quiet]
       engine_klass = ENGINES[options[:engine]] || raise("Invalid database engine: #{options[:engine].inspect}")
       @engine = engine_klass.new(self)
 
@@ -128,8 +132,7 @@ module EY::Flex
       if File.exist?(filename)
         @config = YAML::load(File.read(filename))
       else
-        $stderr.puts "You need to have a backup file at #{filename}"
-        exit 1
+        abort "You need to have a backup file at #{filename}"
       end
     end
 
@@ -139,16 +142,21 @@ module EY::Flex
       end  
     end
     
+    def say(msg, newline = true)
+      return if @quiet
+      print("#{msg}#{"\n" if newline}")
+    end
+
     def backup_database(database)
       File.open("#{self.backup_dir}/#{database}.#{@tmpname}", "w") do |f|
-        puts "doing database: #{database}"
+        say "doing database: #{database}"
         @engine.dump_database(database, f)
       end
 
       File.open("#{self.backup_dir}/#{database}.#{@tmpname}") do |f|
         path = "#{@env}.#{database}/#{database}.#{@tmpname}"
         AWS::S3::S3Object.store(path, f, @bucket, :access => :private)
-        puts "successful backup: #{database}.#{@tmpname}"
+        say "successful backup: #{database}.#{@tmpname}"
       end
     end
 
@@ -158,13 +166,12 @@ module EY::Flex
 
       if obj = list(db)[idx.to_i]
         filename = normalize_name(obj)
-        puts "downloading: #{filename}"
+        say "downloading: #{filename}"
         File.open(filename, 'wb') do |f|
-          print "."
+          say ".", false
           obj.value {|chunk| f.write chunk }
         end
-        puts
-        puts "finished"
+        say "finished"
         [db, filename]
       else
         raise BackupNotFound, "No backup found for database #{db.inspect}: requested index: #{idx}"
@@ -180,8 +187,8 @@ module EY::Flex
     
     def cleanup
       begin
-        list('all',false)[0...-(@keep*@databases.size)].each do |o| 
-          puts "deleting: #{o.key}"
+        list('all')[0...-(@keep*@databases.size)].each do |o| 
+          say "deleting: #{o.key}"
           o.delete
         end
       rescue AWS::S3::S3Exception, AWS::S3::Error
@@ -197,8 +204,8 @@ module EY::Flex
       AWS::S3::S3Object.find name, @bucket
     end
     
-    def list(database='all', printer = false)
-      puts "Listing database backups for #{database}" if printer
+    def list(database='all')
+      say "Listing database backups for #{database}"
       backups = []
       if database == 'all'
         @databases.each do |db|
@@ -208,12 +215,12 @@ module EY::Flex
       else
         backups = AWS::S3::Bucket.objects(@bucket, :prefix => "#{@env}.#{database}").sort
       end
-      if printer
-        puts "#{backups.size} backup(s) found"
-        backups.each_with_index do |b,i|
-          puts "#{i}:#{database} #{normalize_name(b)}"
-        end
-      end    
+
+      say "#{backups.size} backup(s) found"
+
+      backups.each_with_index do |b,i|
+        say "#{i}:#{database} #{normalize_name(b)}"
+      end
       backups
     end
     

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

@@ -0,0 +1,22 @@
+module EyApi
+  def call_api(path, opts={})
+    response = @rest["/api/#{path}"].post(@keys.merge(opts), {"Accept" => "application/json"})
+    JSON.parse(response.body)
+  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/snapshot_minder.rb

@@ -31,6 +31,9 @@ module EY
           options[:command] = :snapshot_volumes
         end
 
+        opts.on("-q", "--quiet", "Supress output to STDOUT") do
+          options[:quiet] = true
+        end
         
       end
 
@@ -40,8 +43,7 @@ module EY
       if File.exist?(config = File.expand_path(defaults[:config]))
         ey = new(options = defaults.merge(YAML::load(File.read(config))).merge(options))
       else
-        puts"You need to have an /etc/.mysql.backups.yml file with your credentials in it to use this tool.\nOr point it at a yaml file with -c .mysql.backups.yml"
-        exit 1
+        abort "You need to have an /etc/.mysql.backups.yml file with your credentials in it to use this tool.\nOr point it at a yaml file with -c .mysql.backups.yml"
       end
 
       ey.send(options[:command])
@@ -52,9 +54,9 @@ module EY
       @opts = opts
       @instance_id = opts[:instance_id]
       @db = Mysql.new('root', opts[:dbpass], opts[:lock_wait_timeout]) rescue nil
-      @ec2 = RightAws::Ec2.new(opts[:aws_secret_id], opts[:aws_secret_key])
+      @ec2 = RightAws::Ec2.new(opts[:aws_secret_id], opts[:aws_secret_key], :logger => Logger.new("/dev/null"))
       get_instance_id
-      find_volume_ids
+      silence_stream($stderr) { find_volume_ids }
     end
     
     def find_volume_ids
@@ -68,7 +70,7 @@ module EY
           end    
         end
       end
-      puts("Volume IDs are #{@volume_ids.inspect}")
+      say "Volume IDs are #{@volume_ids.inspect}"
       @volume_ids
     end
     
@@ -81,7 +83,7 @@ module EY
           end  
         end
       end
-      puts("Snapshots #{@snapshot_ids.inspect}")
+      say "Snapshots #{@snapshot_ids.inspect}"
       @snapshot_ids
     end
     
@@ -93,7 +95,7 @@ module EY
           snaps << snapshot
         end
         (snaps[keep..-1]||[]).each do |snapshot|
-          puts "deleting snapshot of /#{mnt}: #{snapshot[:aws_id]}"
+          say "deleting snapshot of /#{mnt}: #{snapshot[:aws_id]}"
           @ec2.delete_snapshot(snapshot[:aws_id])
         end
       end
@@ -109,7 +111,7 @@ module EY
           snaps << create_snapshot(vid)
         when :db
           @db.flush_tables_with_read_lock
-          puts("Read lock acquired.  Writing master binlog info to #{@master_status_file} and syncing filesystem buffers.")
+          say "Read lock acquired.  Writing master binlog info to #{@master_status_file} and syncing filesystem buffers."
           @db.write_master_status
           sync_filesystem_buffers
           snaps << create_snapshot(vid)
@@ -125,8 +127,8 @@ module EY
       open('http://169.254.169.254/latest/meta-data/instance-id') do |f|
         @instance_id = f.gets
       end
-      raise "Cannot find instance id!" unless @instance_id
-      puts("Instance ID is #{@instance_id}")
+      abort "Cannot find instance id!" unless @instance_id
+      say "Instance ID is #{@instance_id}"
       @instance_id
     end
     
@@ -137,10 +139,24 @@ module EY
     
     def create_snapshot(volume_id)
       snap = @ec2.create_snapshot(volume_id)
-      puts("Created snapshot of #{volume_id} as #{snap[:aws_id]}")
+      say "Created snapshot of #{volume_id} as #{snap[:aws_id]}"
       snap
     end
-    
+
+    private
+      def say(msg, newline = true)
+        return if @opts[:quiet]
+        print("#{msg}#{"\n" if newline}")
+      end
+
+      def silence_stream(stream)
+        old_stream = stream.dup
+        stream.reopen("/dev/null")
+        stream.sync = true
+        yield
+      ensure
+        stream.reopen(old_stream)
+      end
   end
   
   class Mysql
@@ -166,8 +182,6 @@ module EY
     end
     
     def flush_tables_with_read_lock
-      puts("Requesting read lock for snapshot.")
-      
       pipe = IO.popen("mysql -u #{@username} -p#{@password}", 'w')
       @read_lock_pid = pipe.pid
       
@@ -180,14 +194,13 @@ module EY
         # after killing the process the mysql thread is still hanging out, need to kill it directly
         kill_thread_cmd = "mysql -u #{@username} -p#{@password} -e'kill #{thread_id};'" 
         system(kill_thread_cmd)
-        raise "Read lock not acquired after #{@lock_wait_timeout} second timeout.  Killed request and aborting backup."
+        abort "Read lock not acquired after #{@lock_wait_timeout} second timeout.  Killed request and aborting backup."
       end
       
       true
     end
     
     def unlock_tables
-      puts("Unlocking tables")
       # technically we don't actually have to do anything here since the spawned
       # process that has the read lock will die with this one but it doesn't hurt
       # to be safe
@@ -196,10 +209,7 @@ module EY
     end
     
     def disconnect
-      puts("Disconnecting from MySQL")
       @dbh.disconnect
     end
-    
   end
-  
-end 
+end

data/lib/ey-flex/version.rb

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

metadata

@@ -1,110 +1,124 @@
 --- !ruby/object:Gem::Specification 
 name: ey_cloud_server
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 1
-  - 1
-  - 1
-  - pre7
-  version: 1.1.1.pre7
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
-- Ezra Zygmuntowicz
+- Engine Yard Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 -07:00
+date: 2010-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: json
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  name: json
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: right_aws
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-  name: right_aws
-  prerelease: false
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: open4
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 6
+        version: 0.9.6
   type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: aws-s3
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-  name: open4
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-  name: aws-s3
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: ey_stonith
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 5
-        - pre3
-        version: 0.1.5.pre3
-  requirement: *id005
-  name: ey_stonith
-  prerelease: false
-description: Server side components for Engine Yard's cloud
-email: awsmdev@engineyard.com
+        - 2
+        - 0
+        version: 0.2.0
+  type: :runtime
+  version_requirements: *id006
+description: "Server side components for Engine Yard's cloud "
+email: 
+- ninja@engineyard.com
 executables: 
 - eybackup
 - ey-snapshots
 - ey-agent
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
-- LICENSE
+extra_rdoc_files: []
+
 files: 
-- LICENSE
-- README.rdoc
 - 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/version.rb
 - lib/ey-flex.rb
+- bin/eybackup
+- bin/ey-snapshots
+- bin/ey-agent
 has_rdoc: true
-homepage: http://engineyard.com/cloud
+homepage: http://github.com/engineyard
 licenses: []
 
 post_install_message: 
@@ -121,16 +135,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: http://gemcutter.org
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Engine Yard Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,25 +0,0 @@
-== ey
-
-= Development
-
-You need to have gem bundler install
-
-    gem install bundler
-
-Then bundle everything up: 
-
-    gem bundle -- --with-mysql_config
-
-To run the specs, just jump into a "bundled" shell: 
-
-    gem exec bash
-
-Copy the example file to spec/config.yml:
-
-Then you can run specs: 
-
-    spec -c spec
-
-Running the bin files are easy too: 
-
-    bin/ey-recipes