ll-innobackup 0.1.14 → 0.1.17

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 674c9b52e1430fc97e86f45a30b0a3fe97a94213
+  data.tar.gz: c5835dba0684dbeae24a28053bf0f02e0c30632e
+SHA512:
+  metadata.gz: 7f37aa88c6405f105dc2f11e6ee7cb5c8cd0d78b9029a8bf1c2ed2f8aa2ac1c3f60fa115255fab02d8d20f7e929ab714ab6f6f5635e64fe424dab430266652d6
+  data.tar.gz: 6d54cea60e3eda26a747826052380fba7de8352b5ec04e413ddbc970c3881ea80ac9b3ff40b18fd3f14f388387f6bdfab0b25fe5ca8cd7f1ea077eb19aba52e1

data/lib/ll-innobackup.rb

@@ -84,25 +84,24 @@ class InnoBackup
   def lock?(t = type)
     lock_files[t] ||= File.new(InnoBackup.lock_file(t), File::CREAT)
     lock_files[t].flock(File::LOCK_NB | File::LOCK_EX).zero?
-  rescue NoMethodError
-    false
   end
 
   def state(t)
     state_files[t] ||= JSON.parse(File.read(InnoBackup.state_file(t)))
-  rescue Errno::ENOENT
-    {}
   rescue JSON::ParserError
+    puts 'unable to stat state file'
     {}
   end
 
   def fully_backed_up_today?
     require 'active_support/all'
     date = state('full')['date']
-    Time.parse(date).today? if date
+    Time.parse(date).today?
   rescue Errno::ENOENT
+    puts 'unable to obtain last full backup state'
     false
   rescue NoMethodError
+    puts 'unable to obtain last backup state'
     false
   end
 
@@ -153,12 +152,17 @@ class InnoBackup
     @aws_bucket = options['aws_bucket']
   end
 
-  def expected_full_size
-    @expected_full_size = options['expected_full_size'] ||= 15_000_000_000
+  def working_directory
+    return options['working_directory'] if options['working_directory']
+    '/tmp'
   end
 
-  def expected_incremental_size
-    @expected_incremental_size = options['expected_incremental_size'] ||= 5_000_000_000
+  def expected_full_size
+    @expected_full_size ||= -> do
+      return File.size(working_file) if File.exist?(working_file)
+      return options['expected_full_size'] if options['expected_full_size']
+      1_600_000_000
+    end.call
   end
 
   def sql_authentication
@@ -173,7 +177,8 @@ class InnoBackup
 
   def innobackup_command
     "#{backup_bin} #{sql_authentication} "\
-    "#{incremental} #{innobackup_options} /tmp/sql"
+    "#{incremental} #{innobackup_options} /tmp/sql "\
+    "2> #{innobackup_log} > #{working_file}"
   end
 
   def expires_date
@@ -194,22 +199,13 @@ class InnoBackup
   end
 
   def expected_size
-    es = backup_type == 'full' ? expected_full_size : expected_incremental_size
-
-    "--expected-size=#{es}" if es.to_i > 0
+    "--expected-size=#{expected_full_size}" if type == 'full'
   end
 
   def aws_command
-    "#{aws_bin} s3 cp - s3://#{aws_bucket}/#{aws_backup_file}"\
-    " #{expected_size} #{expires}"
-  end
-
-  def aws_debug
-    "--debug" if debug_aws?
-  end
-
-  def debug_aws?
-    @debug_aws = (options['debug_aws'] == true)
+    "#{aws_bin} s3 cp #{working_file} s3://#{aws_bucket}/#{aws_backup_file} "\
+    "#{expected_size} #{expires} "\
+    "2> #{aws_log} >> #{aws_log}"
   end
 
   def valid_commands?
@@ -218,18 +214,22 @@ class InnoBackup
 
   def backup
     require 'English'
-    exc = "#{innobackup_command} 2> #{innobackup_log} | "\
-    "#{aws_command} #{aws_debug} > #{aws_log} 2>&1"
-    `#{exc}`if valid_commands?
-    resp = $CHILD_STATUS
-    @completed = resp = 0
-    puts "Function Returned: #{resp}"
+
+    return unless valid_commands?
+    `#{innobackup_command}`
+    @completed_inno = $CHILD_STATUS == 0
+    raise Innobackup::StateError, 'Unable to run innobackup correctly' unless @completed_inno
+    `#{aws_command}`
+    @completed_aws = $CHILD_STATUS == 0
+    raise Innobackup::StateError, 'Unable to run aws upload correctly' unless @completed_aws
     return record if success? && completed?
-    revert_aws if valid_commands?
+  rescue Innobackup::StateError => e
+    revert_aws
   rescue InnoBackup::NoStateError => e
     STDERR.puts e.message
   ensure
     report
+    cleanup
   end
 
   def revert_aws
@@ -260,8 +260,6 @@ class InnoBackup
   def incremental
     return unless backup_type == 'incremental'
     "--incremental --incremental-lsn=#{lsn_from_state}"
-  rescue Errno::ENOENT
-    ''
   end
 
   def lsn_from_full_backup_state?
@@ -291,6 +289,10 @@ class InnoBackup
     Socket.gethostbyname(Socket.gethostname).first
   end
 
+  def working_file
+    @working_file ||= File.join working_directory, "#{now.iso8601}-percona_backup"
+  end
+
   def aws_backup_file
     return "#{hostname}/#{now.iso8601}/percona_full_backup" if type == 'full'
     "#{hostname}/#{Time.parse(state('full')['date']).iso8601}/percona_incremental_#{now.iso8601}"
@@ -299,7 +301,21 @@ class InnoBackup
   end
 
   def completed?
-    @completed == true
+    completed_aws? && completed_inno?
+  end
+
+  def completed_aws?
+    @completed_aws == true
+  end
+
+  def completed_inno?
+    @completed_inno == true
+  end
+
+  def cleanup
+    File.unlink working_file
+  rescue StandardError => e
+    STDERR.puts "Caught exception #{e} when trying to cleanup"
   end
 
   def report
@@ -308,7 +324,9 @@ class InnoBackup
       STDERR.puts "#{$PROGRAM_NAME}: success: completed #{type} backup"
       return
     end
-    STDERR.puts "#{$PROGRAM_NAME}: failed" 
+    STDERR.puts "Unable to run innobackup" unless completed_inno?
+    STDERR.puts "Unable to run aws s3 command" unless completed_aws?
+    STDERR.puts "#{$PROGRAM_NAME}: failed"
     STDERR.puts 'missing binaries' unless valid_commands?
     inno_tail = InnoBackup.tail_file(innobackup_log, 10)
     STDERR.puts 'invalid sql user' if inno_tail =~ /Option user requires an argument/

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ll-innobackup
 version: !ruby/object:Gem::Version
-  version: 0.1.14
-  prerelease: 
+  version: 0.1.17
 platform: ruby
 authors:
 - Stuart Harland, LiveLink Technology Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,27 +20,10 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.2.6
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.6
 description: A program to conduct innobackup
 email: essjayhch@gmail.com, infra@livelinktechnology.net
 executables:
@@ -50,31 +31,30 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ll-innobackup.rb
 - bin/ll-innobackup
+- lib/ll-innobackup.rb
 homepage: http://rubygems.org/gems/ll-innobackup
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.6.13
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Livelink Innobackup Script
 test_files: []