ey_snaplock 0.0.9 → 0.0.10

data/lib/ey_snaplock.rb

@@ -69,8 +69,24 @@ module EY
 
     def database_lock(database_uri, timeout, &block)
       database = Database.for(database_uri)
+      with_locked_db = block
       lambda do
-        database.with_lock(timeout, &block)
+        lock_filename = database.lock_filename
+        file = File.open(lock_filename, File::RDWR|File::EXCL|File::CREAT) rescue nil
+        if !file && File.mtime(lock_filename) < (Time.now - (20 * 60 * 60))
+          $stdout.puts "Cleared stale database lock: #{lock_filename}"
+          file = File.open(lock_filename, File::RDWR|File::EXCL)
+        elsif !file
+          $stderr.puts "Failed to acquire database lock: #{lock_filename}"
+          exit 1
+        end
+        file.write(Process.pid.to_s)
+        file.close
+        begin
+          database.with_lock(timeout, &with_locked_db)
+        ensure
+          File.delete(lock_filename) if File.exists?(lock_filename)
+        end
       end
     end
 

data/lib/ey_snaplock/database/mysql.rb

@@ -6,8 +6,12 @@ module EY
           @mysql = mysql_command(uri)
         end
 
+        def lock_filename
+          ENV["MYSQL_LOCK_FILENAME"] || "/db/mysql/.ey_snaplock.pid"
+        end
+
         def with_lock(timeout)
-          aquire_lock_within_timeout(timeout)
+          acquire_lock_within_timeout(timeout)
           write_master_status(ENV["MASTER_STATUS_FILE"] || "/db/mysql/.snapshot_backup_master_status.txt")
           yield
         rescue Timeout::Error
@@ -23,11 +27,10 @@ module EY
           system(master_status_cmd)
         end
 
-        def aquire_lock_within_timeout(timeout)
+        def acquire_lock_within_timeout(timeout)
           pipe = IO.popen(@mysql, 'w')
           @read_lock_pid = pipe.pid
           pipe.puts('flush tables with read lock;')
-
           SystemTimer.timeout_after(timeout) do
             until locked?
               sleep 1

data/lib/ey_snaplock/database/postgresql9.rb

@@ -7,9 +7,13 @@ module EY
           @postgresql = postgresql_command(uri)
         end
 
+        def lock_filename
+          ENV["POSTGRES_LOCK_FILENAME"] || "/db/postgres/.ey_snaplock.pid"
+        end
+
         # Default function being called (e.g. database.with_lock)
         def with_lock(timeout) #timeout is ignored
-          aquire_lock
+          acquire_lock
           yield
         ensure
           release_lock
@@ -17,7 +21,7 @@ module EY
 
         # http://wiki.postgresql.org/wiki/Hot_Standby
         # We don't need to acquire a read lock for the snapshot.  However we do need to create an backup of the base database and force a checkpoint to ensure the data is written so when the slave comes up it has enough data to start.
-        def aquire_lock
+        def acquire_lock
           pipe = IO.popen(@postgresql, 'w')
           @read_lock_pid = pipe.pid
           pipe.puts("select pg_start_backup('backup',true);")

data/lib/ey_snaplock/version.rb

@@ -1,5 +1,5 @@
 module EY
   class Snaplock
-    VERSION = '0.0.9'
+    VERSION = '0.0.10'
   end
 end

metadata

@@ -1,89 +1,141 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ey_snaplock
-version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 11
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 10
+  version: 0.0.10
 platform: ruby
-authors:
+authors: 
 - Engine Yard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-29 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: addressable
-  requirement: &2151900320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 2
+        - 2
         version: 2.2.2
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: SystemTimer
   prerelease: false
-  version_requirements: *2151900320
-- !ruby/object:Gem::Dependency
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 2
+        - 1
+        version: 1.2.1
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &2151896640 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
   type: :development
-  prerelease: false
-  version_requirements: *2151896640
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: realweb
-  requirement: &2151895340 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 2
+        - 1
         version: 0.2.1
   type: :development
-  prerelease: false
-  version_requirements: *2151895340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &2151909920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
         version: 0.10.0
   type: :development
-  prerelease: false
-  version_requirements: *2151909920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: aruba
-  requirement: &2151908900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 3
+        version: "0.3"
   type: :development
-  prerelease: false
-  version_requirements: *2151908900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: &2151908160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2151908160
+  version_requirements: *id007
 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
@@ -92,29 +144,39 @@ files:
 - lib/ey_snaplock.rb
 - LICENSE
 - README.md
+has_rdoc: true
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Server side components for Engine Yard's snapshotting process
 test_files: []
-has_rdoc: 
+