snap-ebs 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d2d9b7df8d19e53288b89d957cc9c56d7942d23
-  data.tar.gz: 07e9374eae9478236ef061a582a050d349015a49
+  metadata.gz: c11e7ec18adb6774b2dbf835f003b59e05c7e930
+  data.tar.gz: be9abe78f7df0f2c09004d602e99fb179b83e05e
 SHA512:
-  metadata.gz: 5f8986b7b2a0be56714219a524d8ef65fa6746b2a78b93fae5350c0e8893fe721a93c24550a10e40b4f9c13a482c02add2bdbd79fab5b0cf4ef4f667a2faefa7
-  data.tar.gz: c46faf076355911857de4ca88dedf6649ac5ebaf7e54a1df8c961ba8bc341d7ac3c64fc244ac3b7c56ee0150e6cbe20ee5832e7f64b7747318c95319b4dac8f4
+  metadata.gz: ff0182e964321e3d7eb3f8cdb40a6e3a515832f19e53e01f293e3431420588b1447df431c852e18a291140dade9dab0fa18f9df2be7071d4071536c44d153550
+  data.tar.gz: 8644e526e686edc25461295ffec083bc9941b800925de7abbc3d6bab6d04c2e8b27ad2007ca637e0fc6211d31d2e604d9d7f17e079439756d2ffb23234de40d4

data/README.md

@@ -1,13 +1,13 @@
-snap-ebsc2-ebs-automatic-consistent-snapshot
+snap-ebs
 ===
 
-Easier to use than it is to say, this project aims to provide easy, automatic,
-and consistent snapshots for AWS EBS volumes on EC2 instances.
+This project aims to provide easy, automatic, and consistent snapshots for AWS
+EBS volumes on EC2 instances.
 
 Some specific goals and how they are achieved:
 
  - *Safety*: refuses to operate unless everything seems ok, and tries desperately to leave your system no worse than it started
- - *Reliability*: comprehensive test sweet makes sure that SnapEbs behaves as expected, even in unexpected conditions.
+ - *Reliability*: comprehensive test sweet makes sure that `snap-ebs` behaves as expected, even in unexpected conditions.
  - *Visibility*: verbose logging options to inspect the decision-making process for any action
  - *Ease of Installation*: just install the gem and add one line to your crontab
  - *Ease of Use*: automatically detects volumes mounted to the machine
@@ -30,11 +30,17 @@ sudo yum install gcc \
                  patch \
                  ruby-devel \
                  zlib-devel
+
+gem install snap-ebs
+crontab -e
 ```
 
+Usage
+===
+
+Put something like this in your root crontab:
 ```
-gem install snap-ebsc2-ebs-automatic-consistent-snapshot
-crontab -e
+snap-ebs -a AWSACCESSKEY -s AWSSECRETKEY --directory /data,/log,/journal --mongo --mongo-shutdown yes --logfile /var/log/snap-ebs.log
 ```
 
 Testing
@@ -50,7 +56,7 @@ Like any good Ruby software, this tool has a unit test suite that seeks mostly t
 Vagrant Integration Testing
 ---
 
-The integration layer contains an Ansible + Vagrant setup to configure clusters of services for live-fire testing (the AWS bits are mocked out via SnapEbs's `--mock` flag). Simply running `vagrant up` will build a cluster of servers running MySQL, MongoDB, etc, configured in a master/slave architecture as approprite for the given system.
+The integration layer contains an Ansible + Vagrant setup to configure clusters of services for live-fire testing (the AWS bits are mocked out via `snap-ebs`'s `--mock` flag). Simply running `vagrant up` will build a cluster of servers running MySQL, MongoDB, etc, configured in a master/slave architecture as approprite for the given system.
 
-There is also a set of Ansible tasks that verify the operation of each plugin under **both ideal and pathological** conditions. This means that SnapEbs runs reliably, even when the services it operates on do not. Things like timeouts and service restart failures are modeled via `socat`, and assertions are made on the correct error output for each condition. For more info on how this is done, check `roles/integration-test/tasks/*.yml`
+There is also a set of Ansible tasks that verify the operation of each plugin under **both ideal and pathological** conditions. This means that `snap-ebs` runs reliably, even when the services it operates on do not. Things like timeouts and service restart failures are modeled via `socat`, and assertions are made on the correct error output for each condition. For more info on how this is done, check `roles/integration-test/tasks/*.yml`
 

data/lib/plugins/mongo_plugin.rb

@@ -4,8 +4,10 @@ class SnapEbs::Plugin::MongoPlugin < SnapEbs::Plugin
   attr_accessor :client
   def defined_options
     {
-      service: 'Service to start after shutting down server',
       shutdown: 'Shutdown mongodb server (this is required if your data and journal are on different volumes',
+      command: 'Command to start mongodb if the server must be shut down (i.e. multi-volume Wired Tiger)',
+      'retry': 'How many times to retry starting or unlocking mongodb (default: 720)',
+      interval: 'Interval (in seconds) to wait when retrying (default: 5)',
       user: 'Mongo user',
       password: 'Mongo password',
       port: 'Mongo port',
@@ -19,9 +21,11 @@ class SnapEbs::Plugin::MongoPlugin < SnapEbs::Plugin
 
   def default_options
     {
-      service: 'mongodb',
-      port: '27017',
       shutdown: false,
+      command: "service mongod start",
+      'retry': 720,
+      interval: 5,
+      port: '27017',
       host: 'localhost',
       server_selection_timeout: 30,
       wait_queue_timeout: 1,
@@ -61,11 +65,7 @@ class SnapEbs::Plugin::MongoPlugin < SnapEbs::Plugin
   end
 
   def after
-    if wired_tiger?
-      carefully('start mongo') { start_mongo } if options.shutdown
-    else
-      carefully('unlock mongo') { unlock_mongo }
-    end
+    unlock_or_start_mongo
 
     if carefully('check that mongo is still accessible') { client.command(serverStatus: 1).first }
       logger.info "Received status from mongo, everything appears to be ok"
@@ -76,7 +76,19 @@ class SnapEbs::Plugin::MongoPlugin < SnapEbs::Plugin
     "Mongo"
   end
 
-  private
+  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
+      else
+        return if carefully('unlock mongo') { unlock_mongo }
+      end
+
+      # otherwise we failed
+      logger.warn "Failed to start MongoDB, retrying in #{options.interval} seconds"
+      sleep options.interval.to_i
+    end
+  end
 
   def safe_to_operate?
     # we check for strict equality with booleans here, because nil means an
@@ -88,7 +100,9 @@ class SnapEbs::Plugin::MongoPlugin < SnapEbs::Plugin
 
   def wired_tiger?
     if @wired_tiger.nil?
-      @wired_tiger = client.command(serverStatus: 1).first.has_key? WIRED_TIGER_KEY
+      @wired_tiger = carefully 'detect mongodb\'s storage engine' do
+        client.command(serverStatus: 1).first.has_key? WIRED_TIGER_KEY
+      end
     end
     @wired_tiger
   end
@@ -124,8 +138,8 @@ class SnapEbs::Plugin::MongoPlugin < SnapEbs::Plugin
   end
 
   def start_mongo
-    logger.info "Starting mongodb via 'service #{options[:service]} start'"
-    system "service #{options[:service]} start"
+    logger.info "Starting mongodb via '#{options[:command]}'"
+    system options[:command]
   end
 
   def lock_mongo

data/lib/snap_ebs/plugin.rb

@@ -38,7 +38,7 @@ class SnapEbs::Plugin
 
   def carefully msg
     yield
-  rescue Exception => e
+  rescue => e
     logger.error "Error while trying to #{msg}"
     logger.error e
     nil

data/lib/snap_ebs/snapshotter.rb

@@ -3,6 +3,8 @@ require 'httparty'
 module SnapEbs::Snapshotter
   AWS_INSTANCE_ID_URL = 'http://169.254.169.254/latest/dynamic/instance-identity/document'
 
+  attr_writer :compute
+
   def take_snapshots
     attached_volumes.collect do |vol|
       next unless should_snap vol

data/lib/snap_ebs.rb

@@ -22,6 +22,10 @@ class SnapEbs
     @@logger
   end
 
+  def self.logger= logger_
+    @@logger = logger_
+  end
+
   def plugins
     @plugins ||= registered_plugins.collect { |klass| klass.new }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snap-ebs
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Bryan Conrad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog