mongolly 0.2.1 → 0.2.2

data/lib/mongolly/extensions/bson/timestamp.rb

@@ -9,4 +9,8 @@ class BSON::Timestamp
     increment <=> other.increment
   end
 
+  def -(other)
+    seconds - other.seconds
+  end
+
 end

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

@@ -7,6 +7,7 @@ require 'debugger'
 
 class Mongo::MongoClient
   MAX_DISABLE_BALANCER_WAIT = 60*5 # 5 Minutes
+  REPLICA_SNAPSHOT_THRESHOLD = 60*5 # 5 Minutes
 
   def snapshot_ebs(options={})
 
@@ -33,12 +34,12 @@ class Mongo::MongoClient
         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, options, true )
+      backup_instance(snapshot_ebs_target(REPLICA_SNAPSHOT_THRESHOLD), options, false )
     end
   end
 
 protected
-  def snapshot_ebs_target
+  def snapshot_ebs_target(threshold=nil)
     host_port.join(':')
   end
 
@@ -54,6 +55,9 @@ protected
 
     raise RuntimeError.new "no suitable volumes found"  unless volumes.length > 0
 
+    # Force lock with multiple volumes
+    lock = true  if volumes.length > 1
+
     backup_block = proc do
       volumes.each do |volume|
         @mongolly_logger.debug("Snapshotting #{volume.id} with tag #{options[:backup_key]}")

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

@@ -2,15 +2,21 @@ require 'mongo'
 
 class Mongo::MongoReplicaSetClient
 
-  def most_current_secondary
+  def most_current_secondary(threshold = 0)
     replica = self['admin'].command( replSetGetStatus: 1 )
-    current = replica['members'].select { |m| m['state'] == 2 }.sort_by { |m| m['optime'] }.reverse.first['name']
-    @mongolly_logger.debug("Found most current secondary #{current}")
-    current
+    secondaries = replica['members'].select { |m| m['state'] == 2 }.sort_by { |m| m['name'] }
+    most_current = secondaries.first
+    secondaries[1..-1].each do |secondary|
+      if (secondary['optime'] - most_current['optime']) > threshold
+        most_current = secondary
+      end
+    end
+    @mongolly_logger.debug("Found most current secondary #{most_current['name']}")
+    most_current['name']
   end
 
 protected
-  def snapshot_ebs_target
-    most_current_secondary
+  def snapshot_ebs_target(threshold = 0)
+    most_current_secondary(threshold)
   end
 end

data/lib/mongolly/version.rb

@@ -1,3 +1,3 @@
 module Mongolly
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongolly
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor