bricolage 5.12.0 → 5.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2a7116f2a283155f91b6b272454abf1515850ef
-  data.tar.gz: d6f816f16389853b0acb524deb11824bfb9ed366
+  metadata.gz: 36dc167e62bd2d0e54548baf3f47317e629a3f83
+  data.tar.gz: f8cd8afc4e7334bf75040001b792759c6b85dfec
 SHA512:
-  metadata.gz: 3c165aea2e6e48000218965f89f57889d17677e13a1e1894a958f4c615e20aea8da4672c4718b12a4a7e0df4acdc6b70865bad77a3dd19cfae7ef34f46906be5
-  data.tar.gz: 1c3845da421375c166485d502ca51172d877cfedefe6db8896fb65869a030dbb3e71d8a96ab20804e67d952920fbd6e89ae2efec2ee9bc2a559ede07fb52ac09
+  metadata.gz: f44c628c83e96e476bcfb6b90ab0d96fb49a2d4495966e9ec4c2dfeecefc9b6d3960bd2663c942f0e1eaa3ccf13f57e340a7512f41269f57f36675045149e27b
+  data.tar.gz: 6b41d615ad5ec2a1cdb5d3d54ee99097301302fddd2106427224aacf0f43adca302e292006977792711141fb45827454a99bec8b2691905b65eee8856491a44e

data/lib/bricolage/job.rb

@@ -130,6 +130,7 @@ module Bricolage
     end
 
     def execute
+      ENV['BRICOLAGE_PID'] = Process.pid.to_s
       logger = @context.logger
       logger.info "#{@context.environment} environment"
       result = logger.with_elapsed_time {

data/lib/bricolage/psqldatasource.rb

@@ -186,7 +186,9 @@ module Bricolage
 
     # override
     def run
-      @ds.execute source
+      VacuumLock.using {
+        @ds.execute source
+      }
     end
 
     def run_explain

data/lib/bricolage/vacuumlock.rb

@@ -1,4 +1,5 @@
 require 'bricolage/exception'
+require 'fileutils'
 
 module Bricolage
 
@@ -6,6 +7,7 @@ module Bricolage
     def enable_vacuum_lock?
       !!ENV['BRICOLAGE_VACUUM_LOCK']
     end
+    module_function :enable_vacuum_lock?
 
     DEFAULT_VACUUM_LOCK_FILE = '/tmp/bricolage.vacuum.lock'
     DEFAULT_VACUUM_LOCK_TIMEOUT = 3600   # 60min
@@ -31,7 +33,7 @@ module Bricolage
     def psql_serialize_vacuum_end
       if enable_vacuum_lock?
         path, timeout = vacuum_lock_parameters
-        "\\! rm #{path}"
+        "\\! rm -f #{path}"
       else
         ';'
       end
@@ -67,11 +69,41 @@ module Bricolage
         end
         sleep 1
         retry
-      rescue
-        raise
       end
     end
     module_function :create_vacuum_lock_file
+
+    def VacuumLock.using
+      return yield unless enable_vacuum_lock?
+      begin
+        yield
+      ensure
+        cleanup_vacuum_lock
+      end
+    end
+
+    def using_vacuum_lock(&block)
+      VacuumLock.using(&block)
+    end
+
+    def VacuumLock.cleanup_vacuum_lock
+      return unless enable_vacuum_lock?
+      path, timeout = vacuum_lock_parameters
+      if locking?(path)
+        $stderr.puts "remove VACUUM lock by #{Process.pid}"
+        FileUtils.rm_f path
+      end
+    end
+
+    def VacuumLock.locking?(path)
+      # do not check file existance, just read to avoid race condition
+      locker_pid = File.read(path).slice(/\[(\d+)\]/, 1).to_i
+      $stderr.puts "bricolage_pid: #{$$}, vacuum_locked_by: #{locker_pid}"
+      locker_pid == Process.pid
+    rescue
+      $stderr.puts "bricolage_pid: #{$$}, vacuum_locked_by: (none)"
+      false
+    end
   end
 
 end

data/lib/bricolage/version.rb

@@ -1,4 +1,4 @@
 module Bricolage
   APPLICATION_NAME = 'Bricolage'
-  VERSION = '5.12.0'
+  VERSION = '5.12.1'
 end

data/libexec/create-lockfile

@@ -11,6 +11,9 @@ def main
   path, tm = ARGV
   timeout = [tm.to_i, MINIMUM_TIMEOUT].max
   create_lock_file path, timeout
+rescue
+  emit_error_to_psql
+  raise
 end
 
 def create_lock_file(path, timeout)
@@ -18,7 +21,7 @@ def create_lock_file(path, timeout)
   print_message "trying to create lock file: #{path} (psql #{parent_is_psql? ? 'detected' : 'NOT detected'})"
   begin
     File.open(path, File::WRONLY | File::CREAT | File::EXCL) {|f|
-      f.puts "#{Time.now}: created by process \##{Process.ppid}"
+      f.puts "#{Time.now}: created by create-lockfile (Bricolage pid [#{ENV['BRICOLAGE_PID']}])"
     }
   rescue Errno::EEXIST
     if Time.now - start_time > timeout
@@ -27,9 +30,6 @@ def create_lock_file(path, timeout)
     end
     sleep 3
     retry
-  rescue
-    emit_error_to_psql
-    raise
   end
   print_message "lock file created: #{path}"
 end

data/test/home/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    bricolage (5.12.0)
+    bricolage (5.12.1)
       aws-sdk (< 2)
       mysql2
       pg

data/test/home/subsys/raw-vacuum.jobnet

@@ -0,0 +1 @@
+raw-vacuum

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bricolage
 version: !ruby/object:Gem::Version
-  version: 5.12.0
+  version: 5.12.1
 platform: ruby
 authors:
 - Minero Aoki
@@ -185,6 +185,7 @@ files:
 - test/home/subsys/migrate.job
 - test/home/subsys/net1.jobnet
 - test/home/subsys/net2.jobnet
+- test/home/subsys/raw-vacuum.jobnet
 - test/home/subsys/raw-vacuum.sql.job
 - test/home/subsys/rebuild.sql.job
 - test/home/subsys/search_backends.ct