flor 0.15.0 → 0.16.0

data/lib/flor/unit/models/pointer.rb

@@ -2,6 +2,30 @@
 module Flor
 
   class Pointer < FlorModel
+
+    #create_table :flor_pointers do
+    #
+    #  primary_key :id, type: :Integer
+    #  String :domain, null: false
+    #  String :exid, null: false
+    #  String :nid, null: false
+    #  String :type, null: false  # task, tasked, tag, var
+    #  String :name, null: false # task name, tasked name, tag name, var name
+    #  String :value
+    #  String :ctime, null: false
+    #
+    #  # no :status, no :mtime
+    #
+    #  index :exid
+    #  index [ :exid, :nid ]
+    #  index [ :type, :name, :value ]
+    #
+    #  String :cunit
+    #  String :munit
+    #
+    #  #unique [ :exid, :type, :name, :value ]
+    #    # we don't care, pointers are cleaned anyway when the flow dies
+    #end
   end
 end
 

data/lib/flor/unit/models/timer.rb

@@ -3,6 +3,29 @@ module Flor
 
   class Timer < FlorModel
 
+    #create_table :flor_timers do
+    #
+    #  primary_key :id, type: :Integer
+    #  String :domain, null: false
+    #  String :exid, null: false
+    #  String :nid, null: false
+    #  String :type, null: false # 'at', 'in', 'cron', 'every', ...
+    #  String :schedule, null: false # '20141128.103239' or '00 23 * * *'
+    #  String :ntime # next time
+    #  File :content # JSON msg to trigger
+    #  Integer :count, null: false
+    #  String :status, null: false
+    #  String :ctime, null: false
+    #  String :mtime, null: false
+    #  String :cunit
+    #  String :munit
+    #  String :onid, null: false
+    #  String :bnid, null: false
+    #
+    #  index :exid
+    #  index [ :exid, :nid ]
+    #end
+
     def to_trigger_message
 
       d = self.data(false)
@@ -12,8 +35,7 @@ module Flor
 
       sm = d['m']
 
-      {
-        'point' => 'trigger',
+      { 'point' => 'trigger',
         'exid' => self.exid,
         'nid' => self.onid,
         'bnid' => self.nid,
@@ -21,8 +43,7 @@ module Flor
         'schedule' => self.schedule,
         'timer_id' => self.id,
         'message' => m,
-        'sm' => sm
-      }
+        'sm' => sm }
     end
 
     def ntime_t

data/lib/flor/unit/models/trace.rb

@@ -2,6 +2,20 @@
 module Flor
 
   class Trace < FlorModel
+
+    #create_table :flor_traces do
+    #
+    #  primary_key :id, type: :Integer
+    #  String :domain, null: false
+    #  String :exid, null: false
+    #  String :nid, null: true
+    #  String :tracer, null: false # 'executor', 'trace'
+    #  String :text, null: false # 'blah blah blah'
+    #  String :ctime, null: false
+    #  String :cunit
+    #
+    #  index :exid
+    #end
   end
 end
 

data/lib/flor/unit/models/trap.rb

@@ -3,6 +3,36 @@ module Flor
 
   class Trap < FlorModel
 
+    #create_table :flor_traps do
+    #
+    #  primary_key :id, type: :Integer
+    #  String :domain, null: false
+    #  String :exid, null: false
+    #  String :onid, null: false
+    #  String :nid, null: false
+    #  #
+    #  TrueClass :tconsumed, null: false, default: false
+    #  String :trange, null: false
+    #  String :tpoints, null: true
+    #  String :ttags, null: true
+    #  String :theats, null: true
+    #  String :theaps, null: true
+    #  #
+    #  File :content # JSON msg to trigger
+    #  #
+    #  String :status, null: false
+    #  String :ctime, null: false
+    #  String :mtime, null: false
+    #
+    #  String :cunit
+    #  String :munit
+    #
+    #  String :bnid, null: false
+    #
+    #  index :exid
+    #  index [ :exid, :nid ]
+    #end
+
     def to_hook
 
       opts = {}
@@ -72,19 +102,14 @@ module Flor
 
       msg['trap_id'] = self.id
 
-      if vs = msg['vars']
-
-        k = vs.keys.find { |k| k != 'arguments' } || 'msg'
-        vs[k] = message
+      args = msg['arguments'] = [ [ 'msg', message ] ]
 
-        if sig = message['point'] == 'signal' && message['name']
-          vs['sig'] = sig
-        end
+      if sig = (message['point'] == 'signal' && message['name'])
+        args << [ 'sig', sig ]
       end
-
       if dat['pl'] == 'event'
-        (msg['vars'] ||= {})['payload'] = msg['payload']
-        msg['payload'] = Flor.dup(message['payload'])
+        args << [ 'payload', msg['payload'] ]
+        msg['payload'] = Flor.dup(message['payload']) # FIXME try without this line...
       end
 
       { 'point' => 'trigger',
@@ -95,15 +120,15 @@ module Flor
         'trap_id' => self.id,
         'message' => msg,
         'sm' => message['m'] }
-            #'dbg' => xx
-          #.tap { |m| pp m['message'] }
-          #.tap { |m| pp m }
+#.tap { |m| pp m }
+#.tap { |m| pp m['message'] }
+            #'dbg' => xx }
     end
 
     def to_hash
 
       values
-        .inject({}) { |h, (k, v)| h[k.to_s ] = v if k != :content; h }
+        .inject({}) { |h, (k, v)| h[k.to_s] = v if k != :content; h }
     end
 
     def do_split(v)

data/lib/flor/unit/scheduler.rb

@@ -150,7 +150,7 @@ module Flor
       @thread_status = :running
 
       @thread =
-        if @thread
+        if defined?(@thread) && @thread
           @thread.run
         else
           Thread.new do
@@ -242,12 +242,16 @@ module Flor
 
     def return(message)
 
-      queue({
-        'point' => 'return',
-        'exid' => message['exid'],
-        'nid' => message['nid'],
-        'payload' => message['payload'],
-        'tasker' => message['tasker'] })
+      m =
+        if message['point'] == 'failed'
+          message
+        else
+          message
+            .select { |k, _| %w[ exid nid payload tasker ].include?(k) }
+            .merge!('point' => 'return')
+        end
+
+      queue(m)
 
       nil
     end

data/lib/flor/unit/storage.rb

@@ -73,7 +73,15 @@ module Flor
       end
     end
 
-    def migrate(to=nil, from=nil)
+    def migrate(to=nil, from=nil, opts=nil)
+
+      opts = [ to, from, opts ].find { |e| e.is_a?(Hash) } || {}
+      opts[:target] ||= to if to.is_a?(Integer)
+      opts[:current] ||= from if from.is_a?(Integer)
+        #
+        # defaults for the migration version table:
+        #:table => :schema_info
+        #:column => :version
 
       dir =
         @unit.conf['db_migrations'] ||
@@ -83,13 +91,7 @@ module Flor
 
       synchronize do
 
-        Sequel::Migrator.run(
-          @db, dir,
-          :target => to, :current => from)
-
-        # defaults for the migration version table:
-        #:table => :schema_info
-        #:column => :version
+        Sequel::Migrator.run(@db, dir, opts)
       end
     end
 
@@ -107,9 +109,8 @@ module Flor
           .first(exid: exid) # status active or terminated doesn't matter
 
         return {
-          'exid' => exid, 'nodes' => {}, 'errors' => [], 'tasks' => {},
-          'counters' => {}, 'start' => Flor.tstamp,
-          'size' => -1
+          'exid' => exid, 'nodes' => {}, 'counters' => {},
+          'start' => Flor.tstamp, 'size' => 0
         } unless e
 
         ex = from_blob(e[:content])
@@ -117,7 +118,7 @@ module Flor
         fail("couldn't parse execution (db id #{e[:id].to_i})") unless ex
 
         ex['id'] = e[:id].to_i
-        ex['size'] = e[:content].length
+        ex['size'] = e[:content].size
 
         ex
       end
@@ -141,7 +142,8 @@ module Flor
       end
 
       data = to_blob(exe)
-      exe['size'] = data.length
+      exe['size'] = data.size
+
       u = @unit.identifier
 
       transync do
@@ -179,6 +181,7 @@ module Flor
       end
 
       exe
+        # return the execution hash
 
     rescue => err
 
@@ -309,14 +312,29 @@ module Flor
 
       synchronize(syn) do
 
+        stored, unstored = ms.partition { |m| m['mid'] }
+
+        #
+        # de-reserve any previously stored message, might happen
+        # for "terminated" messages that got queued back to let
+        # other messages get processed
+
+        @db[:flor_messages]
+          .where(id: stored.collect { |m| m['mid'] })
+          .update(status: 'created', mtime: n, munit: u) \
+            if stored.any?
+
+        #
+        # store new messages
+
         @db[:flor_messages]
           .import(
             [ :domain, :exid, :point, :content,
               :status, :ctime, :mtime, :cunit, :munit ],
-            ms.map { |m|
+            unstored.map { |m|
               [ Flor.domain(m['exid']), m['exid'], m['point'], to_blob(m),
-                'created', n, n, u, u ]
-            })
+                'created', n, n, u, u ] }) \
+                  if unstored.any?
       end
 
       @unit.wake_up
@@ -646,7 +664,8 @@ module Flor
 
     def update_pointers(exe, status, now)
 
-# TODO archive old pointers???
+# TODO should we archive old pointers?
+
       exid = exe['exid']
 
       if status == 'terminated'
@@ -666,30 +685,27 @@ module Flor
       dom = Flor.domain(exid)
       u = @unit.identifier
 
-      pointers =
-        exe['nodes'].inject([]) { |a, (nid, node)|
+      pointers = exe['nodes']
+        .inject([]) { |a, (nid, node)|
+
           ts = node['tags']
-          ts.each { |t| a << [ dom, exid, nid, 'tag', t, nil, now, u ] } if ts
-          a
-        }
+          ts.each { |t|
+            a << [ dom, exid, nid, 'tag', t, nil, now, u ] } if ts
 
-      pointers +=
-        (exe['nodes']['0'] || { 'vars' => {} })['vars'].collect { |k, v|
-          case v; when Integer, String, TrueClass, FalseClass
-            [ dom, exid, '0', 'var', k, v.to_s, now, u ]
-          when NilClass
-            [ dom, exid, '0', 'var', k, nil, now, u ]
-          else
-            nil
-          end
-        }.compact
+          vs = nid == '0' ? node['vars'] : nil
+          vs.each { |k, v|
+            case v; when Integer, String, TrueClass, FalseClass
+              a << [ dom, exid, '0', 'var', k, v.to_s, now, u ]
+            when NilClass
+              a << [ dom, exid, '0', 'var', k, nil, now, u ]
+            end } if vs
+
+          #ta = node['heap'] == 'task' ? node['task'] : nil
+          ta = node['task']
+          a << [ dom, exid, nid, 'tasker', ta['tasker'], ta['name'], now, u ] \
+            if ta
 
-      pointers +=
-        exe['tasks']
-          .reject { |_, v|
-            v['tasker'] == nil }
-          .collect { |nid, v|
-            [ dom, exid, nid, 'tasker', v['tasker'], v['name'], now, u ] }
+          a }
 
       cps = @db[:flor_pointers] # current pointers
         .where(exid: exid)
@@ -770,7 +786,7 @@ module Flor
 
         @db.extension(:connection_validator)
         @db.pool.connection_validation_timeout = to
-          # NB: -1 means "check all the time"
+          # NB: -1 means "check at every use"
       end
 
       @db_logger = DbLogger.new(@unit)

data/lib/flor/unit/taskers.rb

@@ -14,12 +14,6 @@ module Flor
 
     protected
 
-    def return(force=false)
-
-      @ganger.return(@message) if force || @ganger
-    end
-    alias reply return
-
     def exid; @message['exid']; end
     def nid; @message['nid']; end
 
@@ -46,22 +40,31 @@ module Flor
 
       if name.is_a?(String)
 
-        [
-          Flor.dup_and_merge(
+        [ Flor.dup_and_merge(
             @message,
             'tasker' => name, 'original_tasker' => @message['tasker'],
-            'routed' => true)
-        ]
+            'routed' => true) ]
 
       else
 
-        [
-          Flor.dup_and_merge(
+        [ Flor.dup_and_merge(
             @message,
-            'routed' => !! name)
-        ]
+            'routed' => !! name) ]
       end
     end
+
+    def reply(message=@message, force=false)
+
+      @ganger.return(message) if force || @ganger
+
+      [] # very important, return no further messages
+    end
+
+    def reply_with_error(error)
+
+      reply(
+        Flor.to_error_message(@message, error))
+    end
   end
 end
 

data/lib/flor/unit/waiter.rb

@@ -63,7 +63,8 @@ module Flor
 
           if @queue.empty?
             fail RuntimeError.new(
-              "timeout for #{self.to_s}") if @on_timeout == 'fail'
+              "timeout for #{self.to_s}"
+            ) if @on_timeout == 'fail'
             return { 'exid' => @exid, 'timed_out' => @on_timeout }
           end
         end
@@ -123,8 +124,8 @@ module Flor
       return s if s.is_a?(Array) && s.collect(&:class).uniq == [ Array ]
 
       (s.is_a?(String) ? s.split(';') : s)
-        .collect { |s|
-          ni, pt = s.strip.match(/\A([0-9_\-]+)? *([a-z|, ]+)\z/)[1, 2]
+        .collect { |ss|
+          ni, pt = ss.strip.match(/\A([0-9_\-]+)? *([a-z|, ]+)\z/)[1, 2]
           [ ni, pt.split(/[|,]/).collect(&:strip) ]
         }
     end