masamune 0.11.7 → 0.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 089f245bbbb77dd701c5179c0ddfd39bd8a6268a
-  data.tar.gz: 05d83327ec4635886d81c342194de1b2d6215375
+  metadata.gz: de2a4fd6bb5a2135bcee2683501ac65a90f91ec9
+  data.tar.gz: 9d2ad4ecc076e523b47486a9d03ff4d2089f98f6
 SHA512:
-  metadata.gz: c94f89286c6910fe8f84a61966614ea67a645ff30f30fc2f0f16fe3651ff78def7d7c486a31785aae98ffcb66ee39832f84817488573ad8543ca095a39bced1e
-  data.tar.gz: 6bb39f3a29afdcba70ad493de7c6e0128bf302442a52ea0e3b2f0423ad4d736e4aa82598096b74e4494cdab913085480ff034d3e19a7757fa673f1481869f9e3
+  metadata.gz: 5d4f7a56bb6ad4fbff0f0203474a79285e056e9562a5c13ca29c15932e8698c68c0a741078a6604d4d91bbcbe863cf775fbb01ae75b4f094b11b76145994c107
+  data.tar.gz: abe67971495a36ec39ff4da7ffe8e45185e45574390861640d0d566a8cbffb1f7c9507ddaa402eb7cf87077c08dadff8fb49e2c647bf377ad96c20beacef2ef1

data/lib/masamune/environment.rb

@@ -53,28 +53,28 @@ module Masamune
       @mutex ||= Mutex.new
     end
 
-    def with_exclusive_lock(name, options = {}, &block)
+    def with_exclusive_lock(name)
       raise 'filesystem path :run_dir not defined' unless filesystem.has_path?(:run_dir)
       lock_name = [name, configuration.lock].compact.join(':')
       logger.debug("acquiring lock '#{lock_name}'")
       lock_file = lock_file(lock_name)
       lock_mode = File::LOCK_EX
-      lock_mode |= File::LOCK_NB if options[:non_blocking]
+      lock_mode |= File::LOCK_NB
       lock_status = lock_file.flock(lock_mode)
       if lock_status == 0
         yield if block_given?
       else
-        logger.error "acquire lock attempt failed for '#{lock_name}'" unless options[:non_blocking]
+        logger.error "acquire lock attempt failed for '#{lock_name}'"
       end
     ensure
-      if lock_file
+      if lock_file && lock_status == 0
         logger.debug("releasing lock '#{lock_name}'")
         lock_file.flock(File::LOCK_UN)
       end
     end
 
     def with_process_lock(name)
-      with_exclusive_lock("#{name}_#{Process.pid}", non_blocking: true) do
+      with_exclusive_lock("#{name}_#{Process.pid}") do
         yield
       end
     end

data/lib/masamune/tasks/elastic_mapreduce_thor.rb

@@ -31,6 +31,7 @@ module Masamune::Tasks
     # FIXME need to add an unnecessary namespace until this issue is fixed:
     # https://github.com/wycats/thor/pull/247
     namespace :elastic_mapreduce
+    skip_lock!
 
     desc 'elastic_mapreduce', 'Launch an ElasticMapReduce ssh session'
     class_option :template, :type => :string, :aliases => '-t', :desc => 'Execute named template command'

data/lib/masamune/tasks/hive_thor.rb

@@ -32,6 +32,7 @@ module Masamune::Tasks
     # FIXME need to add an unnecessary namespace until this issue is fixed:
     # https://github.com/wycats/thor/pull/247
     namespace :hive
+    skip_lock!
 
     desc 'hive', 'Launch a Hive session'
     method_option :file, :aliases => '-f', :desc => 'SQL from files'

data/lib/masamune/tasks/postgres_thor.rb

@@ -31,6 +31,7 @@ module Masamune::Tasks
     # FIXME need to add an unnecessary namespace until this issue is fixed:
     # https://github.com/wycats/thor/pull/247
     namespace :postgres
+    skip_lock!
 
     desc 'psql', 'Launch a Postgres session'
     method_option :file, :aliases => '-f', :desc => 'SQL from files'

data/lib/masamune/tasks/shell_thor.rb

@@ -33,6 +33,7 @@ module Masamune::Tasks
     # FIXME need to add an unnecessary namespace until this issue is fixed:
     # https://github.com/wycats/thor/pull/247
     namespace :shell
+    skip_lock!
 
     desc 'shell', 'Launch an interactive shell'
     method_option :dump, :type => :boolean, :desc => 'Dump SQL schema', :default => false

data/lib/masamune/thor.rb

@@ -103,11 +103,11 @@ module Masamune
         class_option :lock, :desc => 'Optional job lock name', :type => :string
         class_option :initialize, :aliases => '--init', :desc => 'Initialize configured data stores', :type => :boolean, :default => false
         class_option :'--', :desc => 'Extra pass through arguments'
-        def initialize(_args=[], _options={}, _config={})
+        def initialize(_args = [], _options = {}, _config = {})
           self.environment.parent = self
           self.filesystem.environment = self
           self.current_namespace = self.class.namespace unless self.class.namespace == 'masamune'
-          self.current_task_name = _config[:current_command].name
+          self.current_task_name = _config[:current_command].try(:name)
           self.current_command_name = current_namespace ? current_namespace + ':' + current_task_name : current_task_name
           self.class.instance = self
 
@@ -162,16 +162,35 @@ module Masamune
           end
 
           def invoke_command(command, *args)
-            environment.with_exclusive_lock(command.name, non_blocking: true) do
+            return super if self.class.skip_lock?
+            lock_name = qualify_task_name(command.name) + '_command'
+            environment.with_exclusive_lock(lock_name) do
               super
             end
           end
 
           def invoke(name = nil, *args)
-            environment.with_exclusive_lock(name, non_blocking: top_level?) do
+            lock_name = qualify_task_name(name) + '_task'
+            environment.with_exclusive_lock(lock_name) do
               super
             end
           end
+
+          def qualify_task_name(task_name)
+            task, namespace = *task_name.split(':').reverse
+            namespace ||= current_namespace
+            "#{namespace}:#{task.gsub(/_task\Z/, '')}"
+          end
+
+          class << self
+            def skip_lock!
+              @skip_lock = true
+            end
+
+            def skip_lock?
+              @skip_lock
+            end
+          end
         end
 
         private

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.11.7'
+  VERSION = '0.11.8'
 end

data/spec/masamune/environment_spec.rb

@@ -56,7 +56,7 @@ describe Masamune::Environment do
       before do
         instance.filesystem.add_path(:run_dir, run_dir)
         expect(instance.logger).to receive(:error).with(/acquire lock attempt failed for 'some_lock'/)
-        expect_any_instance_of(File).to receive(:flock).twice.and_return(1)
+        expect_any_instance_of(File).to receive(:flock).once.and_return(1)
       end
 
       it { expect { |b| instance.with_exclusive_lock('some_lock', &b) }.to_not raise_error }

data/spec/masamune/thor_spec.rb

@@ -235,4 +235,37 @@ describe Masamune::Thor do
       it { is_expected.to eq([[], ['--more']]) }
     end
   end
+
+  context '#qualify_task_name' do
+    let(:thor_class) do
+      Class.new(Thor) do
+        include Masamune::Thor
+      end
+    end
+
+    let(:instance) { thor_class.new([], {}, {}) }
+
+    before do
+      expect(instance).to receive(:current_namespace).at_most(:once).and_return('namespace')
+    end
+
+    subject do
+      instance.qualify_task_name(name)
+    end
+
+    context 'without namespace' do
+      let(:name) { 'other' }
+      it { is_expected.to eq('namespace:other') }
+    end
+
+    context 'with namespace' do
+      let(:name) { 'namespace:other' }
+      it { is_expected.to eq('namespace:other') }
+    end
+
+    context 'with task suffix' do
+      let(:name) { 'namespace:other_task' }
+      it { is_expected.to eq('namespace:other') }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.11.7
+  version: 0.11.8
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor