mongolly 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b713755ba462faa167a5f77618970f336b5f84d1
-  data.tar.gz: 65ab23831ee92c2a296a6d1b898dd5f1c2e764ba
+  metadata.gz: 4e4150dd42a9bbef396ff00c1975801aa7b3f04a
+  data.tar.gz: 7f45feff004cdb1899b9a23928c245dc5c14e73a
 SHA512:
-  metadata.gz: e472e1c767ad5563c50ed14be637c03fcc1c852ca3a5b11a0c976da568a4157562daba5d773717fb26bee2581be2a5fe72ac7a4df30fe25117c2f2af9eda664b
-  data.tar.gz: 3c4623600ee2eaca0a772d02687b8702cb9f08fb40bca9e0164637ff407dcd153442068ca7746a07c394223b517d119b7a7a68914dc37840f649408152ec6ab0
+  metadata.gz: 3d5fe8937291b7b98be798fa2af5bb8dd62a829e8d373725b23ae56957b1de1bfae80c3b9bdafa60747532d01f50ca73ec2300ef76727999958995b21bc0ae08
+  data.tar.gz: d14155a3d15822d3e2b3de279645a82ceb2b7b159081eb08776e36e5f8b2fae491196932db30f653a5bd63884f37a23ba4cb18710218d02748c33343bfce9dcf

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

@@ -3,8 +3,16 @@ require "logger"
 require "net/ssh"
 require "retries"
 
+class LockFailException < StandardError
+end
+
+class UnlockFailException < StandardError
+end
+
 class Mongo::MongoClient
   MAX_DISABLE_BALANCER_WAIT = 60 * 8 # 8 Minutes
+  MAX_UNLOCK_RETRIES = 3
+  UNLOCK_SLEEP = 10 # 10 Seconds
   REPLICA_SNAPSHOT_THRESHOLD = 60 * 5 # 5 Minutes
   REPLICA_SNAPSHOT_PREFER_HIDDEN = true
   DEFAULT_MONGO_PORT = 27017 # rubocop: disable Style/NumericLiterals
@@ -99,14 +107,18 @@ class Mongo::MongoClient
   def with_database_locked
     @mongolly_logger.debug "Locking database..."
     disable_profiling
-    lock! unless @mongolly_dry_run || locked?
+    # {"info"=>"now locked against writes, use db.fsyncUnlock() to unlock", "seeAlso"=>"http://dochub.mongodb.org/core/fsynccommand", "ok"=>1.0}
+    unless @mongolly_dry_run || locked?
+      response = lock!
+      @mongolly_logger.debug "Lock response: #{response['info']}"
+      raise LockFailException, response["info"] if response["ok"] != 1.0
+    end
     @mongolly_logger.debug "With database locked..."
     yield
   rescue => ex
     @mongolly_logger.error "Error with database locked: #{ex}"
   ensure
-    @mongolly_logger.debug "Unlocking database..."
-    unlock! if !@mongolly_dry_run && locked?
+    strong_unlock!
     enable_profiling
   end
 
@@ -184,13 +196,24 @@ class Mongo::MongoClient
       ssh.loop
     end
 
-    if exit_code != 0
-      raise "Unable to exec #{command} on #{host}, #{output}"
-    end
+    raise "Unable to exec #{command} on #{host}, #{output}" if exit_code != 0
   end
 
   private
 
+  def strong_unlock!
+    @mongolly_logger.debug "Unlocking database..."
+    return if @mongolly_dry_run || !locked?
+    retries ||= 0
+    #  {"info"=>"unlock completed", "ok"=>1.0}
+    response = unlock!
+    raise UnlockFailException, response["info"] if response["ok"] != 1.0 || locked?
+  rescue UnlockFailException => ex
+    @mongolly_logger.warn "Failed to unlock, #{ex}, sleeping #{UNLOCK_SLEEP} on attempt #{retries} of #{MAX_UNLOCK_RETRIES}"
+    sleep UNLOCK_SLEEP
+    retry if (retries += 1) <= MAX_UNLOCK_RETRIES
+  end
+
   def backup_instance(address, options)
     host, port = address.split(":")
     port ||= DEFAULT_MONGO_PORT

data/lib/mongolly/version.rb

@@ -1,3 +1,3 @@
 module Mongolly
-  VERSION = "0.2.13".freeze
+  VERSION = "0.2.14".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongolly
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Michael Saffitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor