mongolly 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c53040071fac994e338d2b6cbab89de76f004ed
-  data.tar.gz: dc8ca819db261832acffdeb97befdc2092422147
+  metadata.gz: c7843a63749c6a2bc5d71ed51459fc3a3410aa89
+  data.tar.gz: 7777cd1c4f38c0b34673720b767f8b013ff49ef8
 SHA512:
-  metadata.gz: 800b11bcb79bd9843b4df63712de6f2534f0e03e16f767ae0fe1bdfec1ac338e5b9d3cdaad94c4f99353484dc1926e32f1c7d7b356dae8a90d80b758644dd95c
-  data.tar.gz: 1f956b32c4560a2a160ee63d7b05cb0db7bcfddaf6837bdfccae04cbab2cb29347d9d55c0302a4ca23e2592622d902caefca6cc1d8fdaff9580c321d71ce07bb
+  metadata.gz: bc764d4b1fdd5bf5b111a9316a2e03e48de60e8198d5a4e5ebbc77e31275fe90d01b2d516a649a9934cf235a10789485d611a20f5b45884b63a093ffad739adf
+  data.tar.gz: 8799ae59ffcb7c43bd2a840cf9849e90e70c3efa337d07543829abd83a83f0232b3fdbd40eee9ce1d5393614ddb2a0fd6a6030b899b5cf43890dcd1a08884274

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

@@ -9,6 +9,9 @@ end
 class UnlockFailException < StandardError
 end
 
+class UnxpectedUnlockException < StandardError
+end
+
 class Mongo::MongoClient
   MAX_DISABLE_BALANCER_WAIT = 60 * 8 # 8 Minutes
   MAX_UNLOCK_RETRIES = 3
@@ -201,9 +204,14 @@ class Mongo::MongoClient
 
   private
 
-  def strong_unlock!
+  def strong_unlock!(aggressive: false)
     @mongolly_logger.debug "Unlocking database..."
-    return if @mongolly_dry_run || !locked?
+    return if @mongolly_dry_run
+    if !locked?
+      return if !aggressive
+      raise UnxpectedUnlockException
+    end
+    return if !locked? && !aggressive
     retries ||= 0
     #  {"info"=>"unlock completed", "ok"=>1.0}
     response = unlock!
@@ -223,7 +231,7 @@ class Mongo::MongoClient
     # This prevents a subclassed replica set from still acting against the
     # primary
     if options[:strict_connection] && (self.host != host || self.port.to_i != port.to_i)
-      return Mongo::MongoClient.new(host, port.to_i, slave_ok: true).snapshot_ebs(options)
+      return Mongo::MongoClient.new(host, port.to_i, slave_ok: true, op_timeout: @op_timeout).snapshot_ebs(options)
     end
 
     instance = @ec2.instances.find_from_address(host, port)

data/lib/mongolly/version.rb

@@ -1,3 +1,3 @@
 module Mongolly
-  VERSION = "0.2.17".freeze
+  VERSION = "0.2.18".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongolly
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - Michael Saffitz