ey_cloud_server 1.4.58 → 1.4.60

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTRlYTdlMDYxN2UzYzI2MTNjM2Y1NGMzMmFjNmJkMWQzOTVkYWU4Mg==
+    MjkxYjFlMDg5ODQwOGNmMmVjZmQyM2VlNDhlNzQ3ZjUwNmY3MzJiYQ==
   data.tar.gz: !binary |-
-    MGQ4M2EwYWVhMmY2OGU0ZGUxYmNhNDdkODdiMjBmN2MwNjdlZDRkZA==
+    ZWEzZmJhMjQ5Y2I2YmFkZWQ1NDVkYWM1OTM5YmIyYzEyNDhmMmI0Zg==
 SHA512:
   metadata.gz: !binary |-
-    N2M0ZGUzOWJhNDRlYTNiMzIxYzQ4YzcwZDY1MGI0OTY2NTVkZDQxZTA4YmQ2
-    OGY5NmUwNTg4ZDFiM2ZjMjNlNmExMjBmMWJhNjFhNGUxYTVlYzhmODlhYjc0
-    M2E2N2M5MWJjZDRlZWE3MGM2MDdkNGJlNDkzMjA2MGIxMDBkZjM=
+    OWI2N2I3ZWJjNjlhN2EwZDBlZjlhMWJkZjRjYzc1MWZhNGVkZDViZDVjYWEz
+    NWUxMGI3NzcyM2EyNmVmZDAzYzQ1MGVkZmY2ZDQyNTBlMGYwZjM3OThmMDE0
+    YWU5ODA3MDc2NTc4NDYxZTQzYjU3Mjg1MTU4YTM3ZTkwNzNiOWI=
   data.tar.gz: !binary |-
-    Mzc1YTczYzU1M2QyODA2NDgwZjE0MzJmNTVmOGEzOGZlNzJjYTc5NGRmYmEz
-    OWZjNjc0NjEyYWVhM2JkOGQxMmFkZTE0NWViNWQ2MDBlYzVjZGVmZTZkZTc2
-    NzgwYTI2NjcwZmQ0NWUwOWVmOTlkNTM3NjM2MzMxYjBlMGE4OTI=
+    ZTBjZjEzNTUzZGI5NTVlNjc1ZWYwZTliYjNhOWYyNjIyYzkyNzc4MjA4YWI2
+    MjJiZDg3ZTI5MTEzZTNlZGUzYTViNTc3Mjc1NDYyYjNlNzAwMjBlMDg5ZGYx
+    ZGY4ZTEwNjM5NTc2NjZlMTk5NWYwNDUzOWYwNWFmY2VlMjNjZWY=

data/bin/ey-snapshots

@@ -10,6 +10,7 @@ require File.dirname(__FILE__) + '/../lib/ey-flex'
 begin
   EY::SnapshotMinder.run(ARGV)
 rescue => e
-  EY.notify_snapshot_error(e)
+  puts e.message
+  EY.notify_snapshot_error(e) unless STDOUT.isatty
   raise
 end

data/bin/eybackup

@@ -12,7 +12,9 @@ require File.dirname(__FILE__) + '/../lib/ey-flex'
 begin
   EY::Backup.run(ARGV)
 rescue => e
-  EY.notify_backup_error(e)
-  raise
+  puts e.message
+  puts "******* Trace *******"
+  puts e.inspect
+  EY.notify_backup_error(e) unless STDOUT.isatty
 end
 

data/bin/eyrestore

@@ -7,7 +7,7 @@ require 'timeout'
 
 def opt_parse(argv)
   options = {}
-  optparse = OptionParser.new do |opts|
+  @optparse = OptionParser.new do |opts|
     opts.banner = "Usage: #{__FILE__} --env <environment name> --database <database_name> --action <action> [options]"
     opts.separator ''
     opts.separator "Wrapper for eybackup used for listing, downloading and restoring database backups. The main purpose for this tool is to"
@@ -20,7 +20,7 @@ def opt_parse(argv)
     opts.separator 'Common Options:'
     
     opts.on('-e', '--env environment_name', "Specifies the source environment name for the backups you will be working with.") { |env| options[:env] = env }
-    opts.on('-d', '--database database_name', "Name of the source database to get backups for.") { |dbname| options[:databases] = [dbname] }
+    opts.on('-d', '--database database_name', "Name of the source database to list backups for.") { |dbname| options[:databases] = [dbname] }
     actions=['list', 'restore', 'download']
     opts.on('-a', '--action action_name', "The action you want to perform using the backup #{actions}.") do |action|
       unless actions.include?(action)
@@ -65,7 +65,7 @@ def opt_parse(argv)
     opts.separator "    sudo -i #{__FILE__} --env production --database todo --action restore --index last"
     opts.separator ''
   end
-  optparse.parse!
+  @optparse.parse!
   options
 end
 
@@ -83,6 +83,7 @@ end
 
 def extra_validations(options)
   mandatory = [:databases, :env, :action]
+  mandatory << :index if %w(download restore).include? options[:action]
   missing = mandatory.select{ |param| options[param].nil? }
   raise OptionParser::MissingArgument, missing.join(',') unless missing.empty?
 end
@@ -92,7 +93,9 @@ def list_backups(engine, db, path)
   debug("Listing backups with command: #{command}")
   res = %x{#{command}}
   last = res.chomp.split("\n").last
-  abort "No Backups Found for that environment and database." if last.match(/0 backup\(s\) found/)
+  if last.match(/0 backup\(s\) found/)
+    abort "No Backups Found for that environment and database.\n Tips:\n  - double check the source environment name is correct\n  - you may have a legacy bucket (grep backup_bucket /etc/.*.backups.yml) in the source environment, pass to eyrestore with --backup_bucket"
+  end
   res
 end
 
@@ -104,6 +107,14 @@ rescue Timeout::Error
   ''  # return nil if timeout
 end
 
+def backup_idx(listing, index)
+  if index == 'last'
+    last_backup_idx(listing)
+  else
+    index
+  end
+end
+
 def last_backup_idx(listing)
   last = listing.chomp.split("\n").last
   if last.split.first.match(/\d+:\w+/)
@@ -132,7 +143,15 @@ config.merge!(eyrestore) unless eyrestore.nil?
 
 # override config from command line options
 config.merge!(options)
-extra_validations(config)
+indexdb = config[:index].split(':')[1] if not config[:index].nil? and config[:index].include? ':'
+config[:databases] = [indexdb] if config[:databases].nil? and not indexdb.nil? and indexdb.match(/^\w+$/)
+begin
+  extra_validations(config)
+rescue OptionParser::MissingArgument => e
+  puts e.message
+  puts @optparse
+  exit
+end
 debug("Config Options: '#{config}'")
 
 # create a temporary configuration file from ~/.eyrestore.config.yml
@@ -156,8 +175,10 @@ end
 
 if ['download','restore'].include?(config[:action])  
   config[:index] = gets_timeout("Enter the backup index to use for #{config[:action]} (e.g. 9:#{db}) ", 30) unless config[:index]
-  config[:index] = last_backup_idx(list_backups(engine, db, temp)) if config[:index] == 'last'
-  abort "Invalid backup index '#{config[:index]}'." unless config[:index].match(/^\d+:\w+$/)
+  config[:index] = backup_idx(list_backups(engine, db, temp), config[:index])
+  # config[:index] = last_backup_idx(list_backups(engine, db, temp)) if config[:index] == 'last'
+  config[:index] = config[:index] + ":#{config[:databases].first}" if config[:index].match(/^\d+$/) and config[:databases] and config[:databases].size == 1
+  abort "Invalid backup index '#{config[:index]}'; proper format is <number>:<dbname>." unless config[:index].match(/^\d+:\w+$/)
   
   action = config[:action] == 'restore' ? '-r' : '-d'
   debug("Set action flag for eybackup to '#{action}' based on action of '#{config[:action]}'")
@@ -174,7 +195,15 @@ if ['download','restore'].include?(config[:action])
   
   res=%x{#{command}}
   puts res
-  puts "Restore complete!" if res.split("\n").last.match(/^Filename/) and config[:action] == 'restore'
+  
+  last_line = res.split("\n").last
+  if last_line.nil?
+    # No-op, eybackup messaging is adequate.
+  elsif last_line.match(/^Filename/) and config[:action] == 'restore' and not last_line.match(/.gpz$/)
+    puts "Restore complete!"
+  else
+    puts "Download complete!"
+  end
 end
 
 # cleanup temporary config file

data/lib/ey-flex/bucket_minder.rb

@@ -16,6 +16,10 @@ module EY
       @bucket ||= @s3.directories.get(@bucket_name)
     end
 
+    def file
+      bucket
+    end
+    
     def files
       bucket.files
     end
@@ -74,7 +78,13 @@ module EY
     end
 
     def put(filename, contents)
-      files.create(:key => filename, :body => contents)
+      files.create(
+        :key => filename, 
+        :body => contents,
+        :public => false,
+        :multipart_chunk_size => 100*1024*1024, # 100MB
+        'x-amz-server-side-encryption' => 'AES256'
+      )
     end
   end
 end

data/lib/ey-flex.rb

@@ -25,7 +25,7 @@ module EY
   end
 
   def self.enzyme_api
-    @enzyme_api ||= EY::Enzyme::API.new(
+    @enzyme_api ||= EY::Enzyme::API::Client.new(
       enzyme_config[:api],
       enzyme_config[:instance_id],
       enzyme_config[:token],

data/lib/ey_backup/backend.rb

@@ -8,7 +8,6 @@ module EY
 
       def initialize(secret_id, secret_key, region, bucket_name)
         @bucket_minder = EY::BucketMinder.new(secret_id, secret_key, bucket_name, region)
-        @s3            = Fog::Storage.new(:provider => 'AWS', :aws_access_key_id => secret_id, :aws_secret_access_key => secret_key, :region => region)
       end
       attr_reader :bucket_minder
 
@@ -17,13 +16,13 @@ module EY
           begin
             object_name = File.join("#{environment_name}.#{database_name}", "#{File.basename(filename)}")
             info "Starting upload: #{filename}"
-            @s3.put_object(@bucket_minder.bucket_name, object_name, File.open(filename,'r'))
+            @bucket_minder.put(object_name, File.open(filename, 'r'))
             info "Successful upload: #{filename}"
           rescue => e
             retries ||= 5
             retries -= 1
             # remove partial or failed uploads
-            @s3.delete_object(@bucket_minder.bucket_name, object_name) rescue nil
+            @bucket_minder.remove_object(object_name)
             raise e if retries == 0
             warn "retrying upload of #{filename}. Got: #{e.inspect}"
             retry

data/lib/ey_backup/backup_set.rb

@@ -31,26 +31,26 @@ module EY
       end
 
       def self.list(databases)
-        names = databases.map do |db|
-          db.name
-        end
-        info "Listing database backups for #{names.join(', ')}"
-
-        backups = databases.map{ |db| db.backups }.flatten
-
-        puts "#{backups.size} backup(s) found"
-
-        backups.each_with_index do |backup_set, i|
-          puts "#{i}:#{backup_set.database_name} #{backup_set.normalized_name}"
+        all_backups = []
+        databases.each do |db|
+          backups = db.backups
+          all_backups << backups
+          puts "Listing database backups for #{db.name}"
+          puts "#{backups.size} backup(s) found"
+          
+          backups.each_with_index do |backup_set, i|
+            puts "#{i}:#{backup_set.database_name} #{backup_set.normalized_name}"
+          end
+          puts  # just some extra whitespace
         end
-
-        backups
+          
+        all_backups.flatten
       end
 
       def self.download(database, index)
-        fatal "You didn't specify a database name: e.g. 1:rails_production" if database.nil? || index.empty?
+        fatal "You didn't specify a database name: e.g. 1:rails_production" if database.nil? || index < 0
 
-        backup = database.backups[index.to_i]
+        backup = database.backups[index]
 
         fatal "No backup found for database #{database}: requested index: #{index}" unless backup
 
@@ -78,9 +78,9 @@ module EY
       def download!
         @remote_filenames = []
         @keys.each do |key|
-          info "Downloading #{key} to #{@database.base_path}"
           remote_filename = File.join(@database.base_path, normalize(key))
           puts "Filename: #{remote_filename}"
+          info "Downloading #{key} to #{@database.base_path}"
           File.open(remote_filename, 'wb') do |f|
             @database.bucket_minder.stream(key) do |chunk, remaining_size, total_size|
               f.write(chunk)

data/lib/ey_backup/cli.rb

@@ -34,14 +34,16 @@ module EY
         # Build a parser for the command line arguments
         options = {}
 
-        opts = OptionParser.new do |opts|
+        optparse = OptionParser.new do |opts|
           opts.version = EY::CloudServer::VERSION
 
           opts.banner = "\nUsage: eybackup [-flag] [argument]"
-          opts.define_head "  eybackup: manage dump (mysqldump/pg_dump) style backups of your database."
+          opts.define_head "  eybackup: manage logical (mysqldump/pg_dump) style backups of your database.",
+           "  When backing up multiple databases, each database is backed up separately."
           opts.separator '*'*80
 
-          opts.on("-l", "--list-backup DATABASE", "List backups for DATABASE") do |db|
+          opts.on("-l", "--list-backup DATABASE_NAME", "List backups for DATABASE_NAME; ",
+                  "  accepts 'all' to list all databases in the config (/etc/.*.backups.yml)") do |db|
             if db == "all"
               db = nil
             end
@@ -52,7 +54,9 @@ module EY
           opts.on("-e", "--engine DATABASE_ENGINE", "The database engine. ex: mysql, postgresql.") do |engine|
             options[:engine] = engine
           end
-          opts.on("-n", "--new-backup", "Create a new backup (default)") do
+          opts.on("-n", "--new-backup [DATABASE_NAME]", "Create a new backup (default).",
+                  "  Backs up each database in '/etc/.*.backups.yml' if DATABASE_NAME not set.") do |db|
+            options[:db] = db.split(',') unless db.nil? or db == ''
             options[:command] = :new_backup
           end
 
@@ -89,9 +93,11 @@ module EY
                   '  Run `eybackup -l #{db_name}` to get the index.',
                   '  BACKUP_INDEX uses the format #{index_number}:#{db_name}') do |index_and_db|
             options[:command] = :download
-            db, index = split_index(index_and_db)
+            index, db = split_index(index_and_db)
+            index = index.to_i
             options[:index] = index
             options[:db] = db
+            raise OptionParser::InvalidArgument, "Index '#{index_and_db}' is not a valid format (hint: <number>:<dbname>)!" if index.nil? or not index.is_a? Numeric
           end
 
           opts.on("-r", "--restore BACKUP_INDEX", "Download and apply the backup specified by index.",
@@ -99,9 +105,11 @@ module EY
                   '  Run `eybackup -l #{db_name}` to get the index.',
                   '  BACKUP_INDEX uses the format #{index_number}:#{db_name}') do |index_and_db|
             options[:command] = :restore
-            db, index = split_index(index_and_db)
+            index, db = split_index(index_and_db)
+            index = index.to_i
             options[:index] = index
             options[:db] = db
+            raise OptionParser::InvalidArgument, "Index '#{index_and_db}' is not a valid format (hint: <number>:<dbname>)!" if index.nil? or not index.is_a? Numeric
           end
           
           options[:force] = false
@@ -109,16 +117,31 @@ module EY
                   "  For use with automated restore operations (e.g. Staging).") do
             options[:force] = true
           end
+          
+          options[:allow_concurrent] = false
+          opts.on("--allow_concurrent", "Allow eybackup process to run concurrently with other eybackup processes.") do
+            options[:allow_concurrent] = true
+          end
+          
+          options[:skip_analyze] = false
+          opts.on("--skip_analyze", "Skip automatic analyze during PostgreSQL Restore operations.") do
+            options[:skip_analyze] = true
+          end
 
         end
 
-        opts.parse!(argv)
+        begin
+          optparse.parse!(argv)
+        rescue => e
+          puts optparse
+          raise
+        end
 
         options
       end
 
       def split_index(index)
-        index.split(':').reverse
+        index.split(':')
       end
 
       def config_for(filename)

data/lib/ey_backup/dumper.rb

@@ -1,3 +1,9 @@
+class String
+   def truncate(limit = 1)
+     self.match(%r{^(.{0,#{limit}})})[1]
+   end
+end
+
 module EY
   module Backup
     class Dumper < Base
@@ -26,15 +32,19 @@ module EY
         
         alert_level=exceptions.empty? ? 'OKAY' : 'FAILURE'
         
-        message.gsub!("\n", '\n')
-        full_txt= "Severity: #{alert_level}\n" \
-                + "Time: #{Time.now.to_i}\n" \
-                + "Type: process-dbbackup summary\n" \
-                + "Plugin: exec\n" \
-                + "raw_message: '#{message}'"
-        full_txt = Shellwords.escape(full_txt)
-        alert_command = %Q(echo #{full_txt} | /engineyard/bin/ey-alert.rb 2>&1)
-        system(alert_command)
+        # we don't provide alert here unless its a failure
+        unless alert_level == 'OKAY'
+          message.gsub!("\n", '\n')
+          message = Shellwords.escape(message).truncate(255)
+          full_txt= "Severity: #{alert_level}\n" \
+                  + "Time: #{Time.now.to_i}\n" \
+                  + "Type: process-dbbackup summary\n" \
+                  + "Plugin: exec\n"
+          full_txt = Shellwords.escape(full_txt)
+          full_txt += "raw_message:\\ \\'#{message}\\'"
+          alert_command = %Q(echo #{full_txt} | /engineyard/bin/ey-alert.rb 2>&1)
+          system(alert_command)
+        end
       end
 
       def initialize(database)
@@ -48,7 +58,7 @@ module EY
         backup_set.split!(split_size)
         backup_set.upload!
 
-        okay("Successful backup: #{@database.name} (#{@database.backup_size})", @database.name)
+        okay(@database.name, @database.backup_size)
         backup_set.cleanup
         backup_set.rm!
         @database.backup_size

data/lib/ey_backup/engine.rb

@@ -3,7 +3,7 @@ module EY
     class Engine < Base
       include Spawner
 
-      attr_reader :username, :password, :host, :key_id, :force
+      attr_reader :username, :password, :host, :key_id, :force, :allow_concurrent, :skip_analyze
 
       def self.label
         @label
@@ -26,8 +26,21 @@ module EY
           EY::Backup.logger.fatal("Unknown database engine: #{label}")
       end
 
-      def initialize(username, password, host, key_id, force)
-        @username, @password, @host, @key_id, @force  = username, password, host, key_id, force
+      def initialize(username, password, host, key_id, force, allow_concurrent, skip_analyze)
+        @username, @password, @host, @key_id, @force, @allow_concurrent, @skip_analyze  = username, password, host, key_id, force, allow_concurrent, skip_analyze
+      end
+      
+      def block_concurrent(db = nil)
+        if backup_running?
+          message = "Unable to backup #{db}: already a backup in progress. Use --allow_concurrent to enable concurrent backup runs."
+          error(message, db) unless File.exists?('/etc/engineyard/skip_concurrent_alerts')  # this skips the dashboard alert
+          abort message
+        end
+      end
+      
+      def backup_running?
+        verbose %x{ps aux | grep [e]ybackup | grep rubygems}
+        %x{ps -ef | grep [e]ybackup | grep rubygems | wc -l}.to_i > 1
       end
 
       def gpg?

data/lib/ey_backup/engines/mysql_engine.rb

@@ -6,7 +6,7 @@ module EY
       def dump(database_name, basename)
         file = basename + '.sql'
 
-        command = "mysqldump #{username_option} #{host_option} #{single_transaction_option(database_name)} #{routines_option} #{master_data_option} #{databases_option(database_name)} 2> /tmp/eybackup.$$.dumperr"
+        command = "( #{server_id} mysqldump #{username_option} #{host_option} #{single_transaction_option(database_name)} #{routines_option} #{master_data_option} #{databases_option(database_name)} ) "
 
         if gpg?
           command << " | " << GPGEncryptor.command_for(key_id)
@@ -17,6 +17,8 @@ module EY
         end
 
         command << " > #{file}"
+        
+        block_concurrent(database_name) unless allow_concurrent
 
         run(command, database_name)
 
@@ -27,14 +29,16 @@ module EY
         command = "cat #{file}"
 
         if file =~ /.gpz$/ # GPG?
-          abort "Cannot restore a GPG backup directly; decrypt the file (#{file}) using your key and then load using the mysql client."
+          abort "\nCannot restore a GPG backup directly; decrypt the file (#{file}) using your key and then load using the mysql client.
+  To decrypt a backup: https://support.cloud.engineyard.com/hc/en-us/articles/205413948-Use-PGP-Encrypted-Database-Backups-with-Engine-Yard-Cloud#restore
+  Once decrypted, restore with: `gunzip -f < <filename> | mysql #{username_option} #{host_option} #{database_name}`\n\n"
         else
           command << " | " << GZipper.gunzip
         end
         
         cycle_database(database_name)
 
-        command << " | mysql #{username_option} #{host_option} #{database_name} 2> /tmp/eybackup.$$.dumperr"
+        command << " | mysql #{username_option} #{host_option} #{database_name} "
 
         run(command, database_name)
       end
@@ -52,12 +56,19 @@ module EY
         "--routines"
       end
       
+      def server_id
+        if log_bin_on?
+          stdout = %x{mysql #{username_option} #{host_option} -BN -e"select @@global.server_id"}
+          "echo '-- Server_id: #{stdout.strip}' && "
+        end 
+      end
+      
       def master_data_option
         "--master-data=2" if log_bin_on?
       end
       
       def databases_option(db)
-        "--add-drop-database --databases #{db}"
+        "#{db}"
       end
 
       def host_option

data/lib/ey_backup/engines/postgresql_engine.rb

@@ -6,7 +6,7 @@ module EY
       def dump(database_name, basename)
         file = basename + '.dump'
 
-        command = "PGPASSWORD='#{password}' pg_dump -h #{host} --create --format=c -Upostgres #{database_name} 2> /tmp/eybackup.$$.dumperr"
+        command = "PGPASSWORD='#{password}' pg_dump -h #{host} --create --format=c -Upostgres #{database_name} "
 
         if gpg?
           command << " | " << GPGEncryptor.command_for(key_id)
@@ -15,6 +15,7 @@ module EY
 
         command << " > #{file}"
 
+        block_concurrent(database_name) unless allow_concurrent
         run(command, database_name)
 
         file
@@ -22,16 +23,24 @@ module EY
 
       def load(database_name, file)
         if file =~ /.gpz$/ # GPG?
-          abort "Cannot restore a GPG backup directly; decrypt the file (#{file}) using your key and then load with pg_restore."
+          abort "\nCannot restore a GPG backup directly; decrypt the file (#{file}) using your key and then load with pg_restore.
+  To decrypt a backup: https://support.cloud.engineyard.com/hc/en-us/articles/205413948-Use-PGP-Encrypted-Database-Backups-with-Engine-Yard-Cloud#restore
+  Once decrypted, restore with: `pg_restore -h #{host} --format=c --clean -Upostgres -d #{database_name} <filename>`\n\n"
         end
 
         cycle_database(database_name)
 
         command = "cat #{file}"
 
-        command << " | PGPASSWORD='#{password}' pg_restore -h #{host} --format=c -Upostgres -d #{database_name} 2> /tmp/eybackup.$$.dumperr"
+        command << " | PGPASSWORD='#{password}' pg_restore -h #{host} --format=c -Upostgres -d #{database_name}"
 
         run(command, database_name)
+        
+        # Analyze database unless disabled
+        unless skip_analyze
+          verbose "Analyzing database '#{database_name}', use --skip-analyze to skip this step."
+          %x{PGPASSWORD='#{password}' vacuumdb -h #{host} -Upostgres -d #{database_name} --analyze-only}
+        end
       end
 
       def check_connections(database_name)
@@ -40,7 +49,7 @@ module EY
         if active_connections.to_i > 0
           res = ''
           unless force
-            puts "There are currently #{stdout.string.to_i} connections on database: '#{database_name}'; can I kill these to continue (Y/n):"
+            puts "There are currently #{active_connections} connections on database: '#{database_name}'; can I kill these to continue (Y/n):"
             Timeout::timeout(30){
               res = gets.strip
             }

data/lib/ey_backup/loader.rb

@@ -16,8 +16,10 @@ module EY
       end
 
       def run
-        info "Restoring #{@database.name}"
+        
         backup = download
+        mode = backup.basename =~ /.gpz$/ ? "Downloading" : "Restoring"
+        info "#{mode} #{@database.name}"
         backup.load!
         backup.remove_joined_file!
       end

data/lib/ey_backup/logger.rb

@@ -1,8 +1,15 @@
+class String
+   def truncate(limit = 1)
+     self.match(%r{^(.{0,#{limit}})})[1]
+   end
+end
+
 module EY
   module Backup
     class Logger
       extend Forwardable
       require 'shellwords'
+      require 'fileutils'
 
       attr_accessor :stdout, :stderr
 
@@ -22,21 +29,22 @@ module EY
 
       def push_dashboard_alert(message, alert_level, db = nil)
         message.gsub!("\n", '\n')
+        message = Shellwords.escape(message).truncate(255)
         type="process-dbbackup"
         type = type + " #{db}" unless db.nil?
         full_txt= "Severity: #{alert_level}\n" \
                 + "Time: #{Time.now.to_i}\n" \
                 + "Type: #{type}\n" \
-                + "Plugin: exec\n" \
-                + "raw_message: '#{message}'"
+                + "Plugin: exec\n"
         full_txt = Shellwords.escape(full_txt)
+        full_txt += "raw_message:\\ \\'#{message}\\'"
         alert_command = %Q(echo #{full_txt} | /engineyard/bin/ey-alert.rb 2>&1)
         verbose "Sending dashboard alert"
         system(alert_command)
       end
 
       def info(msg)
-        puts "#{Time.now} #{msg}" 
+        stdout.puts "#{Time.now} #{msg}" 
       end
 
       def verbose(msg)
@@ -46,24 +54,48 @@ module EY
       def set_verbose()
         @verbose = true
       end
+      
+      def set_log_path=(path)
+        @status_path = path
+        FileUtils.mkdir_p(@status_path)
+      end
 
       def say(msg, newline = true)
         newline ? info(msg) : stdout.print(msg)
       end
 
-      def okay(msg, db = nil)
-        stderr.puts("#{Time.now} OKAY: #{msg}")
-        # push_dashboard_alert(msg, "OKAY", db), we don't push OKAY alerts, we push a summary alert instead.
+      def okay(db, size)
+        filepath = File.join(@status_path, "#{db}.sizes")
+        %x{LOG=$(tail -n 100 #{filepath}); echo "$LOG" > #{filepath}} if File.exists?(filepath)
+        %x{echo "#{Time.now()} #{size}" >> #{filepath}}
+        msg = "Backup successful for '#{db}' after previous failure."
+        push_dashboard_alert(msg, 'OKAY', db) if clear_alert?(db)
       end
 
       def warn(msg, db = nil)
-        stderr.puts("#{Time.now} WARNING: #{msg}")
+        stdout.puts("#{Time.now} WARNING: #{msg}")
+        set_alert(msg, db) unless db.nil?
         push_dashboard_alert(msg, "WARNING", db)
       end
 
       def error(msg, db = nil)
-        stderr.puts("#{Time.now} ERROR: #{msg}")
-        push_dashboard_alert("#{msg}. Details at /var/log/eybackup.log.", "FAILURE", db)
+        stdout.puts("#{Time.now} ERROR: #{msg}")
+        set_alert(msg, db) unless db.nil?
+        push_dashboard_alert("#{msg} Details at /var/log/eybackup.log.", "FAILURE", db)
+      end
+      
+      def set_alert(msg, db)
+        fullPath = File.join(@status_path, "#{db}.alert")
+        File.open(fullPath, 'a') { |file| file.puts "#{Time.now}: #{msg}"}
+      end
+      
+      def clear_alert?(db)
+        begin
+          File.delete(File.join(@status_path, "#{db}.alert"))
+          true
+        rescue Errno::ENOENT
+          false
+        end
       end
             
       def exception(type, msg)
@@ -71,7 +103,7 @@ module EY
       end
       
       def debug(msg)
-        stderr.puts("#{Time.now} DEBUG: #{msg}")
+        stdout.puts("#{Time.now} DEBUG: #{msg}")
       end
 
     end

data/lib/ey_backup/processors/splitter.rb

@@ -5,7 +5,7 @@ module EY
       include Logging
 
       CHUNK_SIZE = 1024 * 64
-      MAX_FILE_SIZE = (4.5*1024*1024*1024).to_i #4.5GB
+      MAX_FILE_SIZE = (4.9*1024*1024*1024*1024).to_i #4.9TB
 
       def self.dump(file, split_size)
         split_size ||= MAX_FILE_SIZE

data/lib/ey_backup/spawner.rb

@@ -42,14 +42,11 @@ module EY
         pid, stdin, stdout, stderr = Open4.popen4("bash -o pipefail -c #{escaped_command}")
         pid, status = Process::waitpid2(pid)
         
-        verbose "stdout: #{stdout.read}"
-        verbose "stderr: #{stderr.read}"
         verbose "status: #{status}"
         
         if ! status.success?
-          dumperr = File.exists?("/tmp/eybackup.#{pid}.dumperr") ? File.read("/tmp/eybackup.#{pid}.dumperr") : status
-          err_msg = "DB dump failed. The error returned was: #{dumperr}"
-          verbose "#{db} backup failed: #{err_msg}"
+          dumperr = File.exists?("/tmp/eybackup.#{pid}.dumperr") ? File.read("/tmp/eybackup.#{pid}.dumperr") : "#{status}: #{stderr.read.chomp}: #{stdout.read.chomp}"
+          err_msg = "#{db} backup failed! The error returned was: #{dumperr}"
           error(err_msg, db)
         end
 

data/lib/ey_backup.rb

@@ -44,6 +44,7 @@ module EY
     class << self
       attr_accessor :logger
       attr_accessor :tmp_dir
+      attr_accessor :log_dir
     end
 
     def self.run(argv = ARGV)
@@ -96,11 +97,12 @@ module EY
         if @options[:db].nil? || @options[:db].empty?
           @options[:databases]
         else
-          [@options[:db]]
+          [@options[:db]].flatten
         end
       end
 
       def setup
+        setup_log_dir
         setup_logger
         setup_tmp_dir
         setup_backend
@@ -117,6 +119,7 @@ module EY
             EY::Backup.logger.set_verbose
           end
         end
+        EY::Backup.logger.set_log_path=EY::Backup.log_dir
       end
 
       def setup_tmp_dir
@@ -126,6 +129,14 @@ module EY
           EY::Backup.tmp_dir = "/mnt/tmp"
         end
       end
+      
+      def setup_log_dir
+        if @options[:log_dir]
+          EY::Backup.log_dir = @options[:log_dir]
+        else
+          EY::Backup.log_dir = "/var/log/engineyard/eybackup"
+        end
+      end
 
       def setup_backend
         @backend = Backend.new(@options[:aws_secret_id], @options[:aws_secret_key], @options[:region], @options[:backup_bucket])
@@ -136,7 +147,7 @@ module EY
         if ! @options.key?(:dbhost) or @options[:dbhost] == nil or @options[:dbhost] == ""
           @options[:dbhost] = 'localhost'
         end
-        @engine = engine_class.new(@options[:dbuser], @options[:dbpass], @options[:dbhost], @options[:key_id], @options[:force])
+        @engine = engine_class.new(@options[:dbuser], @options[:dbpass], @options[:dbhost], @options[:key_id], @options[:force], @options[:allow_concurrent], @options[:skip_analyze])
       end
 
       def dispatch

data/lib/ey_cloud_server/version.rb

@@ -1,5 +1,5 @@
 module EY
   module CloudServer
-    VERSION = '1.4.58'
+    VERSION = '1.4.60'
   end
 end

data/spec/config.yml

@@ -1,5 +1,6 @@
 ---
 tmp_dir: 
+log_dir:
 data_json: 
 mysql_user: root
 mysql_password:

data/spec/ey_backup/mysql_backups_spec.rb

@@ -125,6 +125,24 @@ describe "MySQL Backups" do
     run_sql("SELECT * FROM `bar`;", @db_name).should be_true
     FileUtils.rm(file)
   end
+
+  it 'detects a backup failure due to an invalid view definition and reports it to stdout' do
+    
+    run_sql("CREATE TABLE `foo` (`id` int(11) NOT NULL auto_increment, PRIMARY KEY(`id`));", @db_name).should be_truthy
+    run_sql("CREATE TABLE `bar` (`id` int(11) NOT NULL auto_increment, PRIMARY KEY(`id`));", @db_name).should be_truthy
+    run_sql("CREATE view `vw_foobar` as select `foo`.`id` as `foo_id`, `bar`.`id` as `bar_id` from `foo` inner join `bar` on `foo`.`id` = `bar`.`id`;", @db_name).should be_truthy
+    run_sql("DROP TABLE `bar`;", @db_name).should be_truthy
+    
+    reset_logger
+    
+    EY::Backup.run(["-c", backup_config_file])
+    stdout.should match(/mysqldump: Couldn't execute 'SHOW FIELDS FROM `vw_foobar`'/)
+    
+    files = Dir["#{EY::Backup.tmp_dir}/*#{@db_name}*"]
+
+    files.size.should == 1
+    FileUtils.rm(files.first)  
+  end
 end
 
 describe "MySQL Backups" do

data/spec/helpers.rb

@@ -18,19 +18,29 @@ module Helpers
     FakeWeb.register_uri(:post, "http://example.org/api/environments", :body => JSON.generate({
       @mock_environment_name => {:id => 1}
     }))
-
-    FileUtils.mkdir_p(tmp_dir)
-    Dir.glob("#{tmp_dir}/*").each do |f|
+    
+    create_or_clean_dir(tmp_dir)
+    create_or_clean_dir(log_dir)
+
+    # FileUtils.mkdir_p(tmp_dir)
+    # FileUtils.mkdir_p(log_dir)
+    # Dir.glob("#{tmp_dir}/*").each do |f|
+    #   FileUtils.rm(f)
+    # end
+    stub_configs
+  end
+  
+  def create_or_clean_dir(dir)
+    FileUtils.mkdir_p(dir)
+    Dir.glob("#{dir}/*").each do |f|
       FileUtils.rm(f)
     end
-
-    stub_configs
   end
 
   def stub_configs
     #print "in stub_configs: #{YAML::dump(@database_config)}, #{YAML::dump(spec_config)}\n"
     config = @database_config || spec_config
-    config = config.merge({ :tmp_dir => tmp_dir })
+    config = config.merge({ :tmp_dir => tmp_dir, :log_dir => log_dir })
     # print "in stub_configs2: #{YAML::dump(config)}\n"
     File.open(backup_config_file, "w") do |f|
       f.puts YAML.dump(config )
@@ -55,7 +65,7 @@ module Helpers
     return File.read(PUBLIC_KEY_PATH), File.read(PRIVATE_KEY_PATH)
   end
 
-  def run_after
+  def run_after(skip_file_remove = false)
     FileUtils.rm_f(backup_config_file)
     filenames = Dir.glob("#{tmp_dir}/*")
     if filenames.any?
@@ -183,6 +193,14 @@ module Helpers
       spec_config['tmp_dir'] || File.dirname("./tmp/")
     end
   end
+  
+  def log_dir
+    if spec_config['log_dir'].nil?
+      File.dirname(__FILE__) + "/log/"
+    else
+      spec_config['log_dir'] || File.dirname("./log/")
+    end
+  end
 
   def mysql_user
     spec_config['mysql_user'] || "root"
@@ -280,6 +298,10 @@ module Helpers
   def stdout
     EY::Backup.logger.stdout.string
   end
+  
+  def stderr
+    EY::Backup.logger.stderr.string
+  end
 
   load_spec_config
 end

data/spec/log/ey_flex_postgresql_db_wanting.sizes

@@ -0,0 +1 @@
+2017-05-17 02:10:11 -0400 1.7 KB

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ey_cloud_server
 version: !ruby/object:Gem::Version
-  version: 1.4.58
+  version: 1.4.60
 platform: ruby
 authors:
 - EngineYard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-04 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -78,34 +78,20 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: aws-s3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: ey_enzyme
   requirement: !ruby/object:Gem::Requirement
@@ -293,6 +279,7 @@ files:
 - spec/gpg.public
 - spec/gpg.sekrit
 - spec/helpers.rb
+- spec/log/ey_flex_postgresql_db_wanting.sizes
 - spec/snapshot_minder_spec.rb
 - spec/spec_helper.rb
 homepage: http://developer.engineyard.com
@@ -333,6 +320,7 @@ test_files:
 - spec/gpg.public
 - spec/gpg.sekrit
 - spec/helpers.rb
+- spec/log/ey_flex_postgresql_db_wanting.sizes
 - spec/snapshot_minder_spec.rb
 - spec/spec_helper.rb
 - features/downloading_a_mysql_backup.feature