ey_snaplock 0.0.11 → 0.0.12.pre

data/README.md

@@ -14,8 +14,11 @@ archive_command = '/usr/bin/true'
 ![EY Snaplock](http://img825.imageshack.us/img825/4323/snaplock.jpg "EY Snaplock")
 
 Release process:
+
+``` 
   edit version file
   gem build ey_snaplock.gemspec
-  ey-gem upload ey_snaplock-0.0.5.gem --server public
+  gem push ey_snaplock-0.0.5.gem
   edit version file again
   commit
+```

data/lib/ey_snaplock/database/mysql.rb

@@ -31,7 +31,7 @@ module EY
           pipe = IO.popen(@mysql, 'w')
           @read_lock_pid = pipe.pid
           pipe.puts('flush tables with read lock;')
-          SystemTimer.timeout_after(timeout) do
+          SnaplockTimer.timeout(timeout) do
             until locked?
               sleep 1
             end
@@ -56,6 +56,22 @@ module EY
           Process.kill('TERM', @read_lock_pid) # unlock tables
         end
 
+        def has_long_running_queries?(cutoff_in_seconds)
+          %x<#{@mysql} -B -N -e 'show processlist;'>.split("\n").each do |process_entry|
+            id, user, host, db, command, time, state, info = process_entry.split("\t")
+
+            next if %w{root system}.include? user
+            next if ['Sleep', 'Binlog Dump'].include? command
+
+            return true if time.to_i > cutoff_in_seconds
+          end
+          false
+        end
+
+        def dump_process_list(logfile)
+          system("#{@mysql} -N -e 'show processlist;' >> #{logfile}")
+        end
+
         def mysql_command(uri)
           command = "mysql"
           command << " -u" << (uri.user || 'root')

data/lib/ey_snaplock/version.rb

@@ -1,5 +1,5 @@
 module EY
   class Snaplock
-    VERSION = '0.0.11'
+    VERSION = '0.0.12.pre'
   end
 end

data/lib/ey_snaplock.rb

@@ -1,12 +1,20 @@
 require 'net/http'
 require 'net/https'
 require 'ey_snaplock/database'
-require 'system_timer'
+
+begin
+  require 'system_timer'
+  SnaplockTimer = SystemTimer
+rescue LoadError => e
+  require 'timeout'
+  SnaplockTimer = Timeout
+end
 
 module EY
   class Snaplock
     REQUEST_TIMEOUT = 15
     PER_DATABASE_TIMEOUT = 5
+    LONG_RUNNING_QUERY_RETRIES = 3
 
     def self.call(*argv)
       new(*argv).call
@@ -52,7 +60,7 @@ module EY
     def timeout
       lambda do
         begin
-          SystemTimer.timeout_after(REQUEST_TIMEOUT) { yield }
+          SnaplockTimer.timeout(REQUEST_TIMEOUT) { yield }
         rescue Timeout::Error
           $stderr.puts "Timeout Exceeded: Callback request took longer than #{REQUEST_TIMEOUT} seconds."
           raise
@@ -70,6 +78,24 @@ module EY
     def database_lock(database_uri, timeout, &block)
       database = Database.for(database_uri)
       with_locked_db = block
+
+      if database.respond_to?(:has_long_running_queries?)
+        log_file = '/var/log/ey-snaplock.' + Time.now.strftime("%Y-%m-%dT%H-%M-%S") + '.log'
+        remaining_retries = LONG_RUNNING_QUERY_RETRIES
+
+        while database.has_long_running_queries? && remaining_retries >= 0
+          if remaining_retries == 0
+            database.dump_process_list(log_file)
+            clean_up_old_log_files
+            $stderr.puts "Bailing due to long running queries, process list dumped."
+            exit 1
+          else
+            sleep PER_DATABASE_TIMEOUT
+          end
+        end
+
+      end
+
       lambda do
         lock_filename = database.lock_filename
         file = File.open(lock_filename, File::RDWR|File::EXCL|File::CREAT) rescue nil
@@ -90,6 +116,11 @@ module EY
       end
     end
 
+    def clean_up_old_log_files(count = 10)
+      ordinal = count.succ.to_s
+      "ls -r /var/log/ey-snaplock.*.log | tail -n +#{ordinal} | xargs -I@ rm @"
+    end
+
     private
 
     def post_path_for_uri(uri)

metadata

@@ -1,140 +1,119 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ey_snaplock
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 11
-  version: 0.0.11
+version: !ruby/object:Gem::Version
+  version: 0.0.12.pre
+  prerelease: 7
 platform: ruby
-authors: 
+authors:
 - Engine Yard
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: addressable
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 2
-        - 2
+      - !ruby/object:Gem::Version
         version: 2.2.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: SystemTimer
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 2
-        - 1
-        version: 1.2.1
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: realweb
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: realweb
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.2.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Server side components for Engine Yard's snapshotting process
 email: 
-executables: 
+executables:
 - ey-snaplock
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/ey-snaplock
 - lib/ey_snaplock/database/mysql.rb
 - lib/ey_snaplock/database/postgresql9.rb
@@ -145,36 +124,26 @@ files:
 - README.md
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Server side components for Engine Yard's snapshotting process
 test_files: []
-