mys3ql 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 45f85278cadc72fb6e195a38f152bdf4540b084ecd51d328c73edada8528ec17
-  data.tar.gz: 33527921e258fba6bd9b3de255c6e4e9105030283164898777b2593d04b887d1
+SHA1:
+  metadata.gz: 86d0a66ce7dab918b298c22eb4d667df2cb9ac7c
+  data.tar.gz: cd9527db20ae5a07349b3456e544a0aa3552f9bd
 SHA512:
-  metadata.gz: 9201515cf1d9cc6ae53cfd0079622f09549c2026f1e86759179e32aa42fcf65699cc4f100ea621c59ae22ee018fc3bcdd3de0e931df0d3e257e3629e3e852952
-  data.tar.gz: 051301e9ee660ca95ac3045d78739f2c9a17d988e5433f90987595730c4b69d065a31bd05d7f4510c0bf8998c425308575c4c6f3e9c09e446bbd1c4e443fc0d9
+  metadata.gz: 25abe9f3cc7daee801c8402dbd07b8827608d139ed4a2ca95ec089ed1a7d4335dfbfaa8fd30f10ea06118159d3513fa90c866ac9fa09976b48dc8d05645ac105
+  data.tar.gz: 340d29d1230eda51d4408b8f5fb3597ed7da31276171608469092c10fbe04ceb5f3e0640f3758cbdbe14c2af99804bc5ebb81dd27e6097c661c492d4339d56f4

data/README.md

@@ -21,6 +21,12 @@ To restore from the latest backup (plus binlogs if present):
 
     $ mys3ql restore
 
+To restore a recent subset of binlogs:
+
+    $ mys3ql restore --after NUMBER
+
+– where NUMBER is a 6-digit binlog file number.
+
 By default mys3ql looks for a configuration file at `~/.mys3ql`.  You can override this like so:
 
     $ mys3ql [command] -c FILE

data/bin/mys3ql

@@ -6,14 +6,21 @@ require 'optparse'
 
 params = {}
 op = OptionParser.new do |opts|
-  opts.banner = 'Usage: mys3ql <full|incremental|restore> [<args>]'
+  opts.banner = 'Usage: mys3ql <full|incremental|restore> [<options>]'
+
+  opts.separator ''
+  opts.separator 'Common options:'
 
   opts.on('-c', '--config CONFIG', 'Load configuration from YAML file (default ~/.mys3ql)') { |v| params[:config] = v }
-  opts.on_tail('-d', '--debug', 'Be verbose') { |v| params[:debug] = v }
-  opts.on_tail '-v', '--version', 'Print version' do
+  opts.on('-d', '--debug', 'Be verbose') { |v| params[:debug] = v }
+  opts.on '-v', '--version', 'Print version' do
     puts "mys3ql v#{Mys3ql::VERSION}"
     exit
   end
+
+  opts.separator ''
+  opts.separator 'restore options:'
+  opts.on('-a', '--after NUMBER', 'Use only the subset of binary logs after NUMBER') { |v| params[:after] = v }
 end
 op.parse! ARGV
 
@@ -23,4 +30,4 @@ unless %w[full incremental restore].include? params[:command]
   exit 1
 end
 
-Mys3ql::Conductor.run params[:command], params[:config], params[:debug]
+Mys3ql::Conductor.run params

data/lib/mys3ql/conductor.rb

@@ -6,10 +6,16 @@ require 'mys3ql/s3'
 module Mys3ql
   class Conductor
 
-    def self.run(command, config, debug)
-      conductor = Conductor.new(config)
-      conductor.debug = debug
-      conductor.send command
+    def self.run(args)
+      conductor = Conductor.new args.fetch(:config, nil)
+      conductor.debug = args.fetch(:debug, false)
+
+      command = args.fetch(:command)
+      if command == 'restore'
+        conductor.restore args.fetch(:after, nil)
+      else
+        conductor.send command
+      end
     end
 
     def initialize(config_file = nil)
@@ -38,22 +44,36 @@ module Mys3ql
       end
     end
 
-    # Downloads the latest dump from S3 and loads it into the database.
-    # Downloads each binary log from S3 and loads it into the database.
+    # When 'after' is nil:
+    #
+    # - downloads the latest dump from S3 and loads it into the database;
+    # - downloads each binary log from S3 and loads it into the database.
+    #
+    # When 'after' is given:
+    #
+    # - downloads each binary log following 'after' from S3 and loads it into the database.
+    #
     # Downloaded files are removed from the file system.
-    def restore
-      # get latest dump
-      with_temp_file do |file|
-        @s3.retrieve :latest, file
-        @mysql.restore file
+    def restore(after = nil)
+      unless after
+        # get latest dump
+        with_temp_file do |file|
+          @s3.retrieve :latest, file
+          @mysql.restore file
+        end
       end
 
-      # apply subsequent bin logs
-      @s3.each_bin_log do |log|
-        with_temp_file do |file|
-          @s3.retrieve log, file
-          @mysql.apply_bin_log file
+      # apply bin logs
+      begin
+        tmpfiles = []
+        @s3.each_bin_log(after) do |log|
+          file = Tempfile.new 'mys3ql'
+          tmpfiles << file
+          @s3.retrieve log, file.path
         end
+        @mysql.apply_bin_logs tmpfiles.map(&:path)
+      ensure
+        tmpfiles.each &:close!
       end
 
       # NOTE: not sure about this:

data/lib/mys3ql/mysql.rb

@@ -60,8 +60,8 @@ module Mys3ql
       run "gunzip -c #{file} | #{@config.bin_path}mysql #{cli_options}"
     end
 
-    def apply_bin_log(file)
-      cmd  = "#{@config.bin_path}mysqlbinlog --database=#{@config.database} #{file}"
+    def apply_bin_logs(*files)
+      cmd  = "#{@config.bin_path}mysqlbinlog --database=#{@config.database} #{files.join ' '}"
       cmd += " | #{@config.bin_path}mysql -u'#{@config.user}'"
       cmd += " -p'#{@config.password}'" if @config.password
       run cmd

data/lib/mys3ql/s3.rb

@@ -26,9 +26,15 @@ module Mys3ql
       end
     end
 
-    def each_bin_log(&block)
+    def each_bin_log(after = nil, &block)
+      if after && after !~ /^\d{6}$/
+        puts 'Binary log file number must be 6 digits.'
+        exit 1
+      end
+
       bucket.objects(prefix: bin_logs_prefix)
             .sort_by { |file| file.key[/\d+/].to_i }
+            .select  { |file| after.nil? || (file.key[/\d+/].to_i > after.to_i) }
             .each do |file|
         yield file
       end
@@ -52,7 +58,7 @@ module Mys3ql
 
     def save(local_file_name, s3_key)
       if bucket.object(s3_key).exists?
-        log "s3: skipped #{local_file_name} - #{s3_key} exists"
+        log "s3: skipped #{local_file_name} - already exists"
         return
       end
 

data/lib/mys3ql/version.rb

@@ -1,3 +1,3 @@
 module Mys3ql
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mys3ql
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Andy Stewart
@@ -77,7 +77,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project:
+rubygems_version: 2.5.2.3
 signing_key:
 specification_version: 4
 summary: Simple backup of your MySql database onto Amazon S3.