manband 0.5.0 → 0.5.1

data/bin/jobhandler.rb

@@ -80,6 +80,10 @@ if options[:conf]!=nil
   puts "Using configuration file "+options[:conf]
   FlowConfig.sets3(conf["s3"]["host"],conf["s3"]["port"],conf["s3"]["path"])
   FlowConfig.setworkdir(conf["workdir"])
+  if conf["sudo"] != nil
+    log.info "Sudo mode:"+conf["sudo"].to_s
+    FlowConfig.setsudo(conf["sudo"])
+  end
 end
 
 if options[:store]!=nil
@@ -93,23 +97,8 @@ job "manband.node"+options[:queue]  do |args|
     msg = JSON.parse(args["msg"])
     if args["operation"] == OP_DESTROY
       myworkflow = WorkFlow.get(msg["id"])
-      if myworkflow == nil
-        log.error "Error: workflow does not exists "+msg["id"]
-      else 
-        myworkflow.clean
-        jobs = Job.all(:wid => msg[:id])
-        if jobs!=nil
-          jobs.destroy
-        end
-        links = JobLink.all(:wid => msg[:id])
-        if links!=nil
-          links.destroy
-        end
-        myworkflow.destroy
-        messages = BandMessage.all(:wid => msg[:id])
-        if messages != nil
-          messages.destroy
-        end
+      if myworkflow != nil
+        myworkflow.delete()
       end
     elsif args["operation"] == OP_CLEAN
       myworkflow = WorkFlow.get(msg["id"])

data/lib/manband/flowconfig.rb

@@ -44,6 +44,22 @@ class FlowConfig
 
    @@uploaddir = '/tmp/upload'
 
+   # Sudo commands
+   @@sudo = false
+
+   def self.sudo
+     return @@sudo
+   end
+
+   # Sets sudo mode
+   # If sudo is set, job commands are run with a sudo on user id.
+   # User must exists on the system.
+   #
+   # Can be set in user config file with sudo: true
+   def self.setsudo(dosudo)
+     @@sudo = dosudo
+   end
+
    def self.uploaddir
      return @@uploaddir
    end
@@ -53,6 +69,8 @@ class FlowConfig
    end
 
    # Sets S3 storage parameters
+   #
+   # Parameters can be set in user config fiel under s3 parameter
    def self.sets3(host,port= '8773',path='/services/Walrus')
      @@s3host = host
      @@s3port = port

data/lib/manband/job.rb

@@ -101,10 +101,23 @@ class Job
     curjob = Job.get(@id)
     command = JSON.parse(curjob.command)
     if command.length > 1
-      system(initcmd+command[0])
+      cmd = initcmd+command[0]
     else
-      system(initcmd+command[instance-1])
+      cmd = initcmd+command[instance-1]
     end
+    if FlowConfig.sudo() == true
+      wflow = WorkFlow.get(@wid)
+      script = wflow.workdir+"/"+self.id.to_s+"-"+instance.to_s+".sh"
+      if !File.exists?(wflow.workdir)
+         Dir.mkdir(wflow.workdir)
+         system("chown -R "+wflow.uid+" "+wflow.workdir)
+      end
+      File.open(script, 'w') {|f| f.write("#!/bin/bash\n"+cmd) } 
+      File.chmod(0755,script) 
+      cmd = "sudo -u "+wflow.uid+" '"+script+"'"
+    end
+    @@log.debug cmd
+    system(cmd)
   end
 
   # Change instance counter

data/lib/manband/workflow.rb

@@ -259,15 +259,41 @@ class WorkFlow
 
   # Clean a workflow directory
   def clean
-    workflow = WorkFlow.get(@id)
-    if workflow.workdir == nil
+    if self.workdir == nil
       return
     end
-    if File.directory? workflow.workdir
-      FileUtils.rm_rf(workflow.workdir)
+    if File.directory? self.workdir
+      FileUtils.rm_rf(self.workdir)
     end
   end
 
+  # Delete workflow, its directory and all its components (jobs, messages,...)
+  # deletesub: delete sub workflows too
+  def delete(deletesub=true)
+    self.clean
+    jobs = Job.all(:wid => self.id)
+    if jobs!=nil
+      jobs.destroy
+    end
+    links = JobLink.all(:wid => self.id)
+    if links!=nil
+      links.destroy
+    end
+    messages = BandMessage.all(:wid => self.id)
+    if messages != nil
+      messages.destroy
+    end
+    if deletesub
+      subworkflows = WorkFlow.all(:parent => self.id)
+      if subworkflows != nil
+        subworkflows.each do |sub|
+          sub.delete(false)
+        end
+      end
+    end
+    self.destroy
+  end
+
 end
 
 # Table hosting workflow handler messages

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: manband
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Olivier Sallou
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-10 00:00:00 Z
+date: 2012-07-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amqp
@@ -115,6 +115,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: uuid
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
 description: 
 email: olivier.sallou@irisa.fr
 executables: []
@@ -167,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Workflow orchestrator based on RabbitMQ