ey_snaplock 0.0.12.pre.1 → 0.1.0

data/README.md

@@ -1,24 +1,29 @@
 EY Snaplock
 ===========
 
-almost known as ey-snapshot-really
+![EY Snaplock](http://img825.imageshack.us/img825/4323/snaplock.jpg "EY Snaplock")
+
+Lock the filesystem and execute database specific 'backup' commands before
+calling the provided URI to initiate the snapshot.
 
-lock the filesystem and almost really run the snapshot.
+Unlocks as necessary when the URI returns (when the snapshot is done).
 
-Postgres testing notes,
+Postgres testing notes
+----------------------
 
 wal_level = hot_standby
 archive_mode = on
 archive_command = '/usr/bin/true'
 
-![EY Snaplock](http://img825.imageshack.us/img825/4323/snaplock.jpg "EY Snaplock")
-
-Release process:
+Release process
+---------------
 
-``` 
-  edit version file
+```
+  edit version file and commit
   gem build ey_snaplock.gemspec
   gem push ey_snaplock-0.0.5.gem
+  git tag v0.0.5
+  git push origin v0.0.5
   edit version file again
   commit
-```
+```

data/lib/ey_snaplock.rb

@@ -1,20 +1,12 @@
 require 'net/http'
 require 'net/https'
 require 'ey_snaplock/database'
-
-begin
-  require 'system_timer'
-  SnaplockTimer = SystemTimer
-rescue LoadError => e
-  require 'timeout'
-  SnaplockTimer = Timeout
-end
+require 'ey_snaplock/timer'
 
 module EY
   class Snaplock
     REQUEST_TIMEOUT = 15
     PER_DATABASE_TIMEOUT = 5
-    LONG_RUNNING_QUERY_RETRIES = 3
 
     def self.call(*argv)
       new(*argv).call
@@ -60,7 +52,7 @@ module EY
     def timeout
       lambda do
         begin
-          SnaplockTimer.timeout(REQUEST_TIMEOUT) { yield }
+          EY::Snaplock::Timer.timeout(REQUEST_TIMEOUT) { yield }
         rescue Timeout::Error
           $stderr.puts "Timeout Exceeded: Callback request took longer than #{REQUEST_TIMEOUT} seconds."
           raise
@@ -78,24 +70,6 @@ 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?(PER_DATABASE_TIMEOUT) && remaining_retries >= 0
-          if remaining_retries == 0
-            database.dump_process_list(log_file)
-            clean_up_old_log_files
-            $stderr.puts "Aborting Snaplock due to long running queries.  Process list dumped to #{log_file}."
-            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
@@ -116,11 +90,6 @@ module EY
       end
     end
 
-    def clean_up_old_log_files(logs_to_keep = 10)
-      ordinal = logs_to_keep.succ.to_s
-      "ls -r /var/log/ey-snaplock.*.log | tail -n +#{ordinal} | xargs -I@ rm @"
-    end
-
     private
 
     def post_path_for_uri(uri)

data/lib/ey_snaplock/database/mysql.rb

@@ -7,7 +7,7 @@ module EY
         end
 
         def lock_filename
-          ENV["MYSQL_LOCK_FILENAME"] || "/db/mysql/.ey_snaplock.pid"
+          ENV["MYSQL_LOCK_FILENAME"] || "/var/run/ey_snaplock_mysql.pid"
         end
 
         def with_lock(timeout)
@@ -31,7 +31,7 @@ module EY
           pipe = IO.popen(@mysql, 'w')
           @read_lock_pid = pipe.pid
           pipe.puts('flush tables with read lock;')
-          SnaplockTimer.timeout(timeout) do
+          EY::Snaplock::Timer.timeout(timeout) do
             until locked?
               sleep 1
             end
@@ -56,22 +56,6 @@ 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/database/postgresql9.rb

@@ -8,7 +8,7 @@ module EY
         end
 
         def lock_filename
-          ENV["POSTGRES_LOCK_FILENAME"] || "/db/postgresql/.ey_snaplock.pid"
+          ENV["POSTGRES_LOCK_FILENAME"] || "/var/run/ey_snaplock_postgresql.pid"
         end
 
         # Default function being called (e.g. database.with_lock)

data/lib/ey_snaplock/timer.rb

@@ -0,0 +1,15 @@
+module EY
+  class Snaplock
+    class Timer
+      def self.timeout(sec)
+        if RUBY_VERSION =~ /^1\.8/
+          require 'system_timer'
+          SystemTimer.timeout_after(sec) { yield }
+        else
+          require 'timeout'
+          Timeout.timeout(sec) { yield }
+        end
+      end
+    end
+  end
+end

data/lib/ey_snaplock/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ey_snaplock
 version: !ruby/object:Gem::Version
-  version: 0.0.12.pre.1
-  prerelease: 7
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Engine Yard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
   name: realweb
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +118,7 @@ files:
 - lib/ey_snaplock/database/mysql.rb
 - lib/ey_snaplock/database/postgresql9.rb
 - lib/ey_snaplock/database.rb
+- lib/ey_snaplock/timer.rb
 - lib/ey_snaplock/version.rb
 - lib/ey_snaplock.rb
 - LICENSE
@@ -137,12 +138,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Server side components for Engine Yard's snapshotting process