snap-ebs 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 038e0d25b2351492bf303b74f04c5e5263036df1
-  data.tar.gz: 6d4d2fec3684e3291dc2cc78c11eb5fc22c016a4
+  metadata.gz: c62d36f1e86965f89d7733040c0ed8d6a70054be
+  data.tar.gz: 30e45d4efff41f0813b14a1a113b33daab257f41
 SHA512:
-  metadata.gz: 8de0823435ddeace70b1ba6cb8d55c0d46f9413e9bad0ab7bc972b44a2b6cc21f5a49ff56190430e6fa31974a3799e3e9633fa122319cd858f691109fc01f2bf
-  data.tar.gz: 6f2fcbfdd89f34f712f1fe5775cba9a6a61d125c1406ad694e74279e1159a7b0a420fe6682bacc0abc4fe7720261febd44052eec1c9188a098c69cc7e2267ff9
+  metadata.gz: d434a18fa189acf1ba449b49a6cce5e9058614c5cb35e0eb62c44a26ca9f43a34b0290122fa2b139134f2e8a8fd52d1883e2453b5fb258b54e6af6348f25efad
+  data.tar.gz: 089ba5066f153d6b1d8c542372c626d1dd17e8e9f251a719a7f6053bca980be34c0744fd23279f7ca0c4b0f0e8b9e06029d9d8054690d3d617256d4761de1f21

data/lib/plugins/mongo_plugin.rb

@@ -14,7 +14,7 @@ class SnapEbs::Plugin::MongoPlugin < SnapEbs::Plugin
       host: 'Mongo host',
       server_selection_timeout: 'Timeout in seconds while choosing a server to connect to (default 30)',
       wait_queue_timeout: 'Timeout in seconds while waiting for a connection in the pool (default 1)',
-      connection_timeout: 'Timeout in seconds to wait for a socket to connect (default 5)',
+      connect_timeout: 'Timeout in seconds to wait for a socket to connect (default 5)',
       socket_timeout: 'Timeout in seconds to wait for an operation to execute on a socket (default 5)'
     }
   end
@@ -29,7 +29,7 @@ class SnapEbs::Plugin::MongoPlugin < SnapEbs::Plugin
       host: 'localhost',
       server_selection_timeout: 30,
       wait_queue_timeout: 1,
-      connection_timeout: 5,
+      connect_timeout: 5,
       socket_timeout: 5
     }
   end
@@ -65,7 +65,7 @@ class SnapEbs::Plugin::MongoPlugin < SnapEbs::Plugin
   def unlock_or_start_mongo
     (options.retry.to_i + 1).times do
       if wired_tiger?
-        return if carefully('start mongo') { start_mongo } if options.shutdown
+        return if options.shutdown && carefully('start mongo') { start_mongo }
       else
         return if carefully('unlock mongo') { unlock_mongo }
       end
@@ -149,7 +149,7 @@ class SnapEbs::Plugin::MongoPlugin < SnapEbs::Plugin
       password: options.password,
       server_selection_timeout: options.server_selection_timeout.to_i,
       wait_queue_timeout: options.wait_queue_timeout.to_i,
-      connection_timeout: options.connection_timeout.to_i,
+      connect_timeout: options.connect_timeout.to_i,
       socket_timeout: options.socket_timeout.to_i
     }
   end

data/lib/plugins/mysql_plugin.rb

@@ -1,22 +1,92 @@
 class SnapEbs::Plugin::MysqlPlugin < SnapEbs::Plugin
   def defined_options
     {
-      user: 'MySql Username',
-      pass: 'MySql Password',
-      port: 'MySql port',
-      host: 'MySql host'
+      shutdown: 'MySQL will only be shut down when this is set to "yes"',
+      username: 'MySQL Username',
+      password: 'MySQL Password',
+      port: 'MySQL port',
+      host: 'MySQL host'
+    }
+  end
+
+  def default_options
+    {
+      shutdown: 'no',
+      username: 'root',
+      password: 'root',
+      port: 3306,
+      host: 'localhost'
     }
   end
 
   def before
-    require 'mysql'
-    Mysql.new
+    require 'mysql2'
+    if master?
+      logger.error "This appears to be a master in a replication set. Refusing to operate."
+      return false
+    end
+    lock_tables
+    stop_mysql if options.shutdown == 'yes'
+    true
   end
 
   def after
+    if master?
+      logger.error "This appears to be a master in a replication set. Refusing to operate."
+      return false
+    end
+    true
+  ensure
+    unlock_tables
+    start_mysql if options.shutdown == 'yes'
   end
 
   def name
     "Mysql"
   end
+
+  def client
+    @client ||= Mysql2::Client.new host: options.host, username: options.username, password: options.password, port: options.port
+  end
+
+  private
+
+  def slave?
+    if @slave == nil
+      @slave = logger.debug client.query("SHOW SLAVE STATUS").to_a.any?
+    end
+    @slave 
+  end
+
+  def lock_tables
+    client.query("FLUSH LOCAL TABLES")
+    client.query("FLUSH LOCAL TABLES WITH READ LOCK")
+  end
+
+  def unlock_tables
+    client.query("UNLOCK TABLES")
+  end
+
+  # > If you see no Binlog Dump threads on a master server, this means that
+  # > replication is not running—that is, that no slaves are currently
+  # > connected.
+  #
+  # https://dev.mysql.com/doc/refman/5.1/en/master-thread-states.html
+  def master?
+    if @master == nil
+      @master = client.query("SHOW PROCESSLIST").to_a.map { |x| x['Command'] }.include? 'Binlog Dump'
+    end
+
+    @master
+  end
+
+  def stop_mysql
+    # TODO
+    system("service mysql stop")
+  end
+
+  def start_mysql
+    # TODO
+    system("service mysql start")
+  end
 end

data/lib/snap_ebs.rb

@@ -4,6 +4,7 @@ require 'ostruct'
 require 'snap_ebs/options'
 require 'snap_ebs/snapshotter'
 require 'snap_ebs/plugin'
+require 'snap_ebs/version'
 
 class SnapEbs
   include SnapEbs::Options

data/lib/snap_ebs/options.rb

@@ -42,6 +42,11 @@ class SnapEbs
           o.on("-d", "--directory PATH", "Only snap volumes mounted to PATH, a comma-separated list of directories") do |d|
             options.directory = d
           end
+
+          o.on("", "--version", "Show version and exit") do |d|
+            puts "snap-ebs v#{::SnapEbs::VERSION}"
+            exit 0
+          end
         end
 
         plugins.each { |plugin| plugin.collect_options @option_parser }

data/lib/snap_ebs/snapshotter.rb

@@ -8,18 +8,28 @@ module SnapEbs::Snapshotter
   # Takes snapshots of attached volumes (optionally filtering by volumes
   # mounted to the given directories)
   def take_snapshots
-    system 'sync'
-    attached_volumes.collect do |vol|
-      dir = device_to_directory device_name vol
-      fs_freeze dir if options[:fs_freeze]
-      next unless should_snap vol
-      logger.debug "Snapping #{vol.id}"
-      snapshot = compute.snapshots.new
-      snapshot.volume_id = vol.id
-      snapshot.description = snapshot_name(vol)
-      snapshot.save
-      snapshot
-      fs_unfreeze dir if options[:fs_freeze]
+    begin
+      system 'sync'
+      attached_volumes.each do |vol|
+        dir = device_to_directory device_name vol
+        fs_freeze dir if options[:fs_freeze]
+        next unless should_snap vol
+        logger.debug "Snapping #{vol.id}"
+        begin
+          snapshot = compute.snapshots.new
+          snapshot.volume_id = vol.id
+          snapshot.description = snapshot_name(vol)
+          snapshot.save
+          snapshot
+        rescue StandardError => e
+          logger.warn "Received error while snapping #{vol.id}:"
+          logger.warn e
+        end
+        fs_unfreeze dir if options[:fs_freeze]
+      end
+    rescue StandardError => e
+      logger.warn "Received error while walking volumes:"
+      logger.warn e
     end
   end
 

data/lib/snap_ebs/version.rb

@@ -0,0 +1,3 @@
+class SnapEbs
+  VERSION = '0.0.22'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snap-ebs
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Bryan Conrad
@@ -14,56 +14,42 @@ dependencies:
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.31'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Tested, service-aware and consistent AWS EC2 backups via EBS snapshots.
@@ -81,6 +67,7 @@ files:
 - lib/snap_ebs/options.rb
 - lib/snap_ebs/plugin.rb
 - lib/snap_ebs/snapshotter.rb
+- lib/snap_ebs/version.rb
 homepage: http://rubygems.org/gems/snap-ebs
 licenses:
 - MIT
@@ -91,17 +78,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: EBS backups in a snap