manband 0.7.0 → 0.8.0

data/README

@@ -108,6 +108,7 @@ Webband may use this gem, or use current files with same hierarchy
 
 ## History
 
+0.8: Add Interactive feature
 0.7: 
      Add IF management
      Fix some message dispatching issues

data/bin/ackband.rb

@@ -0,0 +1,66 @@
+require 'rubygems'
+require 'yaml'
+require 'optparse'
+require 'amqp'
+require 'json'
+require 'logger'
+
+$:.push File.expand_path("../lib")
+
+require 'manband/flowconfig.rb'
+require 'manband/util.rb'
+
+
+# The program sends a message operation to the workflow control to ack a job.
+# This program does not need database credentials but needs AMQP_URL set.
+# Author: Olivier Sallou <olivier.sallou@irisa.fr>
+# Copyright: 2012, IRISA
+
+
+log = Logger.new(STDOUT)
+log.level = Logger::INFO
+
+options = {}
+
+optparse = OptionParser.new do|opts|
+  
+  # This displays the help screen, all programs are
+  # assumed to have this option.
+  opts.on( '-h', '--help', 'Display this screen' ) do
+    puts opts
+    exit
+  end
+
+  options[:workflow] = nil
+  opts.on( '-w', '--workflow ID', 'Id of the worflow') do |id|
+    options[:workflow] = id
+  end
+
+  options[:job] = nil
+  opts.on( '-j', '--job ID', 'Job id') do |id|
+    options[:job] = id
+  end
+
+  options[:instance] = 0
+  opts.on( '-i', '--instance ID', 'Job instance number, defaults to 0') do |id|
+    options[:instance] = id
+  end
+
+  options[:handler] = 'interactive'
+  opts.on( '-d', '--handler NAME', 'Handler name, defaults to interactive') do |id|
+    options[:handler] = id
+  end
+
+end
+
+optparse.parse!
+
+if options[:workflow]==nil || options[:job]==nil
+  puts "Missing parameter!"
+  exit
+end
+
+msg = '{ "workflow" : "'+options[:workflow].to_s+'" ,  "id" : "'+options[:job].to_s+'", "handler" : "'+options[:handler].to_s+'", "instance" : "'+options[:instance].to_s+'" }'
+
+Utils.publish('manband.master',{ "operation" => "finish", "msg" => msg })
+

data/bin/jobhandler.rb

@@ -28,7 +28,7 @@ require 'manband/store.rb'
 handler = Time.now.to_s
 
 log = Logger.new(STDOUT)
-log.level = Logger::DEBUG
+log.level = Logger::INFO
 
 options = {}
 

data/bin/workflowhandler.rb

@@ -30,7 +30,7 @@ require 'manband/job.rb'
 require 'manband/bandmanager.rb'
 
 log = Logger.new(STDOUT)
-log.level = Logger::DEBUG
+log.level = Logger::INFO
 
 
 @@options = {}
@@ -164,7 +164,7 @@ EventMachine.run do
         if myjob.status == STATUS_SKIP
           doSkip = true
         end
-        if msg["handler"]!=nil && myjob.handler != msg["handler"]
+        if msg["handler"]!=nil && myjob.handler != msg["handler"] && myjob.type!=INTERACTIVE_ACTOR
           log.debug "Finish received from a different handler "+myjob.handler+" vs "+msg["handler"]+", skipping message"
         else
           myjob.finish

data/lib/manband/bandmanager.rb

@@ -13,7 +13,7 @@ require 'manband/flowconfig.rb'
 class BandManager
 
   @@log = Logger.new(STDOUT)
-  @@log.level = Logger::DEBUG
+  @@log.level = Logger::INFO
 
 
   # Loads a workflow file

data/lib/manband/flowconfig.rb

@@ -35,11 +35,14 @@ OP_CLEAN = "clean"  # Delete work dirs of workflow
 OP_DESTROY = "destroy"  # Delete workflow and its work dirs
 OP_STORE = "store" # Store result to S3
 
+# Actors type are exclusive
 # Basic actor
 ACTOR = -1
 # If actor, i.e. ony one of the following jobs will be executed. Selected job match the exit code of the command. Type of the node will be set to selected output
 # WARNING: input of IF actors MUST NOT be a pattern matchng multiple files. The IF condition must be executed only once, not on a bunch of files.
 IF_ACTOR = -2
+# Interactive actor: there is no automatic FINISH message. Command is executed and user/an other script will send a FINISH message when appropriate.
+INTERACTIVE_ACTOR = -3
 
 
 # This class holds the base config

data/lib/manband/job.rb

@@ -34,7 +34,7 @@ class Job
   end
 
   @@log = Logger.new(STDOUT)
-  @@log.level = Logger::DEBUG
+  @@log.level = Logger::INFO
 
   @channel = nil
   @delivery_tag = nil
@@ -95,13 +95,17 @@ class Job
       jobmsg = '{ "workflow" : "'+@wid.to_s+'" ,  "node" : "'+@node+'", "id" : "'+@id.to_s+'", "handler" : "'+curhandler.to_s+'", "instance" : "'+instance.to_s+'" }'
       sendmessage(OP_ERROR,jobmsg)
     else
-      if curjob.store == STORE_DO || curjob.store == STORE_ERROR
-        workflow = WorkFlow.get(curjob.wid)
-        jobmsg = '{ "id" : "'+curjob.id.to_s+'", "bucket" : "'+workflow.bucket+'" }'
-        sendmessage(OP_STORE,jobmsg)
+      if @type == INTERACTIVE_ACTOR
+        @@log.debug "Interactive job, job will take in charge the answer and storage"
+      else
+        if curjob.store == STORE_DO || curjob.store == STORE_ERROR
+          workflow = WorkFlow.get(curjob.wid)
+          jobmsg = '{ "id" : "'+curjob.id.to_s+'", "bucket" : "'+workflow.bucket+'" }'
+          sendmessage(OP_STORE,jobmsg)
+        end
+        jobmsg = '{ "workflow" : "'+@wid.to_s+'" ,  "node" : "'+@node+'", "id" : "'+@id.to_s+'", "handler" : "'+curhandler.to_s+'", "instance" : "'+instance.to_s+'" }'
+        sendmessage(OP_FINISH,jobmsg)
       end
-      jobmsg = '{ "workflow" : "'+@wid.to_s+'" ,  "node" : "'+@node+'", "id" : "'+@id.to_s+'", "handler" : "'+curhandler.to_s+'", "instance" : "'+instance.to_s+'" }'
-      sendmessage(OP_FINISH,jobmsg)
     end
     ack()
     end # End EventMachine
@@ -120,7 +124,7 @@ class Job
   # wordir: job working directory
   # instance: instance number in the list of commands
   def runcommand(workdir,instance)
-    initcmd = "AMQP_URL="" && MYSQL_URL="" && mkdir -p "+workdir+" && cd "+workdir+" && WORKDIR="+workdir+" && " 
+    initcmd = "AMQP_URL='' && MYSQL_URL='' && WID="+@wid.to_s+" && JID="+@id.to_s+" && INSTANCE="+instance.to_s+" && mkdir -p "+workdir+" && cd "+workdir+" && WORKDIR="+workdir+" && " 
     curjob = Job.get(@id)
     command = JSON.parse(curjob.command)
     if command.length > 1

data/lib/manband/workflow.rb

@@ -19,7 +19,7 @@ class WorkFlow
   include DataMapper::Resource
 
   @@log = Logger.new(STDOUT)
-  @@log.level = Logger::DEBUG
+  @@log.level = Logger::INFO
 
   property :id,         Serial    # An auto-increment integer key
   property :uid,   Text  # user id
@@ -113,6 +113,9 @@ class WorkFlow
         if fworkflow["workflow"][job]["type"]=='if'
           type = IF_ACTOR
         end
+        if fworkflow["workflow"][job]["type"]=='interactive'
+          type = INTERACTIVE_ACTOR
+        end
         workdir = FlowConfig.getjobdir(@workdir)
         if curnode == "root"
           workdir = self.workdir + "/root";

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: manband
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Olivier Sallou
@@ -126,6 +126,7 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - bin/env.sh
+- bin/ackband.rb
 - bin/manband.rb
 - bin/remoteband.rb
 - bin/jobhandler.rb