mongolly 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d73eae25653648079e0557d07b6ba9952b45d302
-  data.tar.gz: f0f56ea2f3a5f3fa4f7ea7654658453e085c0d05
+  metadata.gz: ac849aa6e734e18e7d3c76cedd59595b36dda1ba
+  data.tar.gz: 884b04ec2321d46e84aac06efdccdcf3da776917
 SHA512:
-  metadata.gz: 2f9c420e393587cb3ca3894175112437834625af3bd308ab96bf50e79ed116a6931a87cb601a17b9915a60666cb505aae80c4e63c24fb3e825f1d910c29f83dc
-  data.tar.gz: 7d382fce218c64c7917c52257a58f66e88828956d95b63cb6e3cafbe1fa3a980a9209dae44ff83de925692c8529c8be13a468ec1bf6f95b1a7add2c18bb80c55
+  metadata.gz: ebae305017011d239b7c3fd333c453a3bed1026a472ae07f9ed4c005e449995ceb3ebe2210fcf8b79df0a91d64600c15e0136cd418b2ca0eea12773fb25049d5
+  data.tar.gz: 4392b563a59dbcacafc9de3669cb90314392029e4e26810f94a6694dbbbeb2667c0d56a9f1b5fd35328de4e09a8dd954b795f720e053a90a307610680726efa7

data/lib/mongolly/extensions/mongo/mongo_client.rb

@@ -9,7 +9,6 @@ class Mongo::MongoClient
   REPLICA_SNAPSHOT_PREFER_HIDDEN = true
 
   def snapshot_ebs(options={})
-
     @mongolly_dry_run = options[:dry_run] || false
     @mongolly_logger = options[:logger] || Logger.new(STDOUT)
     options[:volume_tag] ||= 'mongolly'
@@ -20,17 +19,14 @@ class Mongo::MongoClient
     if mongos?
       @mongolly_logger.info("Detected sharded cluster")
       with_disabled_balancing do
-        # Stop Config Server
-        ssh_command(options[:config_server_ssh_user], config_server, options[:mongo_stop_command], options[:config_server_ssh_keypath])
-
-        backup_instance(config_server, options, false)
+        with_config_server_stopped(options) do
+          backup_instance(config_server, options, false)
 
-        shards.each do |name,hosts|
-          @mongolly_logger.debug("Found Shard #{name} with hosts #{hosts}.")
-          replica_set_connection(hosts, options).snapshot_ebs(options)
+          shards.each do |name,hosts|
+            @mongolly_logger.debug("Found Shard #{name} with hosts #{hosts}.")
+            replica_set_connection(hosts, options).snapshot_ebs(options)
+          end
         end
-        # Start Config Server
-        ssh_command(options[:config_server_ssh_user], config_server, options[:mongo_start_command], options[:config_server_ssh_keypath])
       end
     else
       backup_instance(snapshot_ebs_target(REPLICA_SNAPSHOT_THRESHOLD, REPLICA_SNAPSHOT_PREFER_HIDDEN), options, false )
@@ -102,6 +98,19 @@ protected
     return @config_server
   end
 
+  def with_config_server_stopped(options={})
+    begin
+      # Stop Config Server
+      ssh_command(options[:config_server_ssh_user], config_server, options[:mongo_stop_command], options[:config_server_ssh_keypath])
+      yield
+    rescue => ex
+      @mongolly_logger.error "Error with config server stopped: #{ex.to_s}"
+    ensure
+      # Start Config Server
+      ssh_command(options[:config_server_ssh_user], config_server, options[:mongo_start_command], options[:config_server_ssh_keypath])
+    end
+  end
+
   def with_disabled_balancing
     begin
       disable_balancing
@@ -115,6 +124,8 @@ protected
       end
       @mongolly_logger.debug "With shard balancing disabled..."
       yield
+    rescue => ex
+      @mongolly_logger.error "Error with disabled balancer: #{ex.to_s}"
     ensure
       enable_balancing
     end
@@ -127,6 +138,8 @@ protected
       lock!  unless @mongolly_dry_run || locked?
       @mongolly_logger.debug "With database locked..."
       yield
+    rescue => ex
+      @mongolly_logger.error "Error with database locked: #{ex.to_s}"
     ensure
       @mongolly_logger.debug "Unlocking database..."
       unlock!  if !@mongolly_dry_run && locked?
@@ -182,7 +195,7 @@ protected
 
   def replica_set_connection(hosts, options)
     db = Mongo::MongoReplicaSetClient.new(hosts)
-    db['admin'].authenticate(options[:db_username], options[:db_password], true)
+    db['admin'].authenticate(options[:db_username], options[:db_password])
     return db
   end
 

data/lib/mongolly/shepherd.rb

@@ -54,7 +54,7 @@ module Mongolly
         @logger.debug "connecting to a single instance #{@database}"
         Mongo::MongoClient.new(*@database.split(':'))
       end
-      db['admin'].authenticate(@db_username, @db_password, true)
+      db['admin'].authenticate(@db_username, @db_password)
       return db
     end
   end

data/lib/mongolly/version.rb

@@ -1,3 +1,3 @@
 module Mongolly
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongolly
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Michael Saffitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor