bumbleworks 0.0.81 → 0.0.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba5107c8d92ddb8478fb30368178febaf26f6a0d
-  data.tar.gz: 845838859128ba26395fd1da45b4938051885123
+  metadata.gz: 804829e3161fb2670468286592f615f6fea68d0f
+  data.tar.gz: 9dcb8fb16e7e379630b6f7a782c298f652cbdab2
 SHA512:
-  metadata.gz: e8bb0121ed0b8216b4499ac35f281c29bf74b686caf0a3dbd8b80cb2e923ed3a864a1be95d9e822fbb67e0a5c140a63b6818a3f7d0227759bc8959588ddcfbda
-  data.tar.gz: 744f4cf5217a6fe39b414feb2aa2eb3daabfb54469f9fc1533edd210866d3080a76a75f9aceebf0b92ded794cc122eea46e5b186d144fd3c73ee984e7ecabd35
+  metadata.gz: c8754753a28d8a68cdc8684f752425591e2ca7da29213b2ade253f63471a9d7cab24aef4799d0841b5d29f13073f169f7985590198da69476fab6190fac33dc4
+  data.tar.gz: b45afd4311dd8a2ba30dea2229abd7467063a60535294f7eabe196aef2b3980851ec77548988ca34b532bab4bf895bcff7c79dbb6c992d19e9c2c842a1ef3154

data/lib/bumbleworks/ruote.rb

@@ -48,7 +48,6 @@ module Bumbleworks
       end
 
       def cancel_process!(wfid, options = {})
-        options[:timeout] ||= Bumbleworks.timeout
         unless options[:method] == :kill
           options[:method] = :cancel
         end
@@ -59,14 +58,12 @@ module Bumbleworks
           storage.remove_process(wfid)
         end
 
-        start_time = Time.now
-        while dashboard.process(wfid)
-          if (Time.now - start_time) > options[:timeout]
-            error_type = options[:method] == :cancel ? CancelTimeout : KillTimeout
-            raise error_type, "Process #{options[:method]} for wfid '#{wfid}' taking too long.  Errors: #{dashboard.errors(wfid)}"
-          end
-          sleep 0.1
+        Bumbleworks::Support.wait_until(options) do
+          dashboard.process(wfid).nil?
         end
+      rescue Bumbleworks::Support::WaitTimeout
+        error_type = options[:method] == :cancel ? CancelTimeout : KillTimeout
+        raise error_type, "Process #{options[:method]} for wfid '#{wfid}' taking too long.  Errors: #{dashboard.errors(wfid)}"
       end
 
       def kill_process!(wfid, options = {})
@@ -74,15 +71,13 @@ module Bumbleworks
       end
 
       def cancel_all_processes!(options = {})
-        options[:timeout] ||= Bumbleworks.timeout
         unless options[:method] == :kill
           options[:method] = :cancel
         end
 
         notified_process_wfids = []
 
-        start_time = Time.now
-        while dashboard.process_wfids.count > 0
+        Bumbleworks::Support.wait_until(options) do
           new_process_wfids = dashboard.process_wfids - notified_process_wfids
           if options[:method] == :cancel || !options[:force]
             send_cancellation_message(options[:method], new_process_wfids)
@@ -90,13 +85,11 @@ module Bumbleworks
             storage.clear
           end
           notified_process_wfids += new_process_wfids
-
-          if (Time.now - start_time) > options[:timeout]
-            error_type = options[:method] == :cancel ? CancelTimeout : KillTimeout
-            raise error_type, "Process #{options[:method]} taking too long - #{dashboard.process_wfids.count} processes remain.  Errors: #{dashboard.errors}"
-          end
-          sleep 0.1
+          dashboard.process_wfids.count == 0
         end
+      rescue Bumbleworks::Support::WaitTimeout
+        error_type = options[:method] == :cancel ? CancelTimeout : KillTimeout
+        raise error_type, "Process #{options[:method]} taking too long - #{dashboard.process_wfids.count} processes remain.  Errors: #{dashboard.errors}"
       end
 
       def send_cancellation_message(method, process_wfids)

data/lib/bumbleworks/support.rb

@@ -3,6 +3,7 @@ module Bumbleworks
   # could also be accomplished by monkey-patching String class.
   module Support
     module_function
+    class WaitTimeout < StandardError; end
 
     def camelize(string)
       string = string.sub(/^[a-z\d]*/) { $&.capitalize }
@@ -50,5 +51,16 @@ module Bumbleworks
       return nil if string.nil?
       humanize(string).gsub(/\b('?[a-z])/) { $1.capitalize }
     end
+
+    def wait_until(options = {}, &block)
+      options[:timeout] ||= Bumbleworks.timeout
+      start_time = Time.now
+      until block.call
+        if (Time.now - start_time) > options[:timeout]
+          raise WaitTimeout
+        end
+        sleep 0.1
+      end
+    end
   end
 end

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.81"
+  VERSION = "0.0.82"
 end

data/lib/bumbleworks/worker.rb

@@ -55,18 +55,26 @@ class Bumbleworks::Worker < Ruote::Worker
     end
 
     def change_worker_state(new_state, options = {})
-      options[:timeout] ||= Bumbleworks.timeout
       with_worker_state_enabled do
         Bumbleworks.dashboard.worker_state = new_state
-        start_time = Time.now
-        until worker_states.values.all? { |state| state == new_state }
-          if (Time.now - start_time) > options[:timeout]
-            raise WorkerStateNotChanged, "Worker states: #{worker_states.inspect}"
-          end
-          sleep 0.1
+        Bumbleworks::Support.wait_until(options) do
+          worker_states.values.all? { |state| state == new_state }
         end
       end
       return true
+    rescue Bumbleworks::Support::WaitTimeout
+      raise WorkerStateNotChanged, "Worker states: #{worker_states.inspect}"
+    end
+
+    def refresh_worker_info(options = {})
+      with_worker_state_enabled do
+        Bumbleworks::Support.wait_until(options) do
+          info.all? { |id, worker_info|
+            worker_info['state'] == 'stopped' ||
+              Time.parse(worker_info['put_at']) > Time.now - 1
+          }
+        end
+      end
     end
 
     def with_worker_state_enabled
@@ -86,7 +94,7 @@ class Bumbleworks::Worker < Ruote::Worker
   end
 
   def save_info
-    @info.save_with_cleanup if @info
+    @info.save if @info
   end
 
   def shutdown
@@ -101,34 +109,56 @@ class Bumbleworks::Worker < Ruote::Worker
     end
   end
 
+  def info
+    self.class.info[id]
+  end
+
   class Info < Ruote::Worker::Info
-    def <<(msg)
-      last_save = @last_save
-      super
-      cleanup_saved_info if Time.now > last_save + 60
-    end
+    def save
+      doc = @worker.storage.get('variables', 'workers') || {}
 
-    def save_with_cleanup
-      save
-      cleanup_saved_info
-    end
+      doc['type'] = 'variables'
+      doc['_id'] = 'workers'
 
-    def cleanup_saved_info
-      key = [@worker.name, @ip.gsub(/\./, '_'), $$.to_s].join('/')
-      doc = @worker.storage.get('variables', 'workers')
-      existing_worker_info = doc['workers'].delete(key)
-      if existing_worker_info
-        doc['workers'][@worker.id] = existing_worker_info.merge({
-          'state' => @worker.state,
-          'name' => @worker.name
-        })
-        result = @worker.storage.put(doc)
-        # result will be nil if put succeeded; if it's not,
-        # let's try again
-        cleanup_saved_info if result
-      else
-        cleanup_saved_info
-      end
+      now = Time.now
+
+      @msgs = @msgs.drop_while { |msg|
+        Time.parse(msg['processed_at']) < now - 3600
+      }
+      mm = @msgs.drop_while { |msg|
+        Time.parse(msg['processed_at']) < now - 60
+      }
+
+      hour_count = @msgs.size < 1 ? 1 : @msgs.size
+      minute_count = mm.size < 1 ? 1 : mm.size
+
+      (doc['workers'] ||= {})[@worker.id] = {
+
+        'class' => @worker.class.to_s,
+        'name' => @worker.name,
+        'ip' => @ip,
+        'hostname' => @hostname,
+        'pid' => $$,
+        'system' => @system,
+        'put_at' => Ruote.now_to_utc_s,
+        'uptime' => Time.now - @since,
+        'state' => @worker.state,
+
+        'processed_last_minute' =>
+          mm.size,
+        'wait_time_last_minute' =>
+          mm.inject(0.0) { |s, m| s + m['wait_time'] } / minute_count.to_f,
+        'processed_last_hour' =>
+          @msgs.size,
+        'wait_time_last_hour' =>
+          @msgs.inject(0.0) { |s, m| s + m['wait_time'] } / hour_count.to_f
+      }
+
+      r = @worker.storage.put(doc)
+
+      @last_save = Time.now
+
+      save if r != nil
     end
   end
 end

data/spec/lib/bumbleworks/worker_spec.rb

@@ -38,7 +38,7 @@ describe Bumbleworks::Worker do
         subject.run_in_thread
         workers[0].shutdown
         workers[1].instance_variable_set(:@state, nil)
-        workers[1].instance_variable_get(:@info).save_with_cleanup
+        workers[1].instance_variable_get(:@info).save
         expect(described_class.worker_states).to eq({
           subject.id => 'running'
         })
@@ -59,12 +59,32 @@ describe Bumbleworks::Worker do
       end
     end
 
+    describe '.refresh_worker_info' do
+      it 'times out if info is not updated in time' do
+        allow(described_class).to receive(:info).and_return({
+          :dummy_id => { 'put_at' => (Time.now - 60).to_s }
+        })
+        expect {
+          described_class.refresh_worker_info(:timeout => 0.1)
+        }.to raise_error(Bumbleworks::Support::WaitTimeout)
+      end
+
+      it 'refreshes worker info' do
+        subject.run_in_thread
+        doc = subject.storage.get('variables', 'workers')
+        doc['workers'][subject.id]['put_at'] = (Time.now - 30).to_s
+        subject.storage.put(doc)
+        described_class.refresh_worker_info
+        expect(Time.parse(subject.info['put_at'])).to be_within(1).of(Time.now)
+      end
+    end
+
     describe '.purge_stale_worker_info' do
       it 'deletes all worker info where state is stopped or nil' do
         subject.run_in_thread
         workers[0].shutdown
         workers[1].instance_variable_set(:@state, nil)
-        workers[1].instance_variable_get(:@info).save_with_cleanup
+        workers[1].instance_variable_get(:@info).save
         subject_info = described_class.info[subject.id]
         described_class.purge_stale_worker_info
         expect(described_class.info).to eq({
@@ -125,4 +145,10 @@ describe Bumbleworks::Worker do
       expect(subject.id).to eq('smokeeeeys')
     end
   end
+
+  describe '#info' do
+    it 'returns worker info for worker id' do
+      expect(subject.info).to eq(described_class.info[subject.id])
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.81
+  version: 0.0.82
 platform: ruby
 authors:
 - Maher Hawash