Merge branch 'origin-2939-re-run-job-button' into 2882-job-process-stats
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 4 Jun 2014 19:03:37 +0000 (15:03 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 4 Jun 2014 19:03:37 +0000 (15:03 -0400)
apps/workbench/app/controllers/jobs_controller.rb
apps/workbench/app/models/job.rb
apps/workbench/app/views/jobs/_show_status.html.erb
apps/workbench/config/routes.rb
sdk/cli/bin/crunch-job
services/api/script/crunch-dispatch.rb
services/crunch/crunchstat/go.sh [new file with mode: 0755]
services/crunch/crunchstat/src/arvados.org/crunchstat/crunchstat.go [new file with mode: 0644]
services/fuse/bin/arv-mount

index f693fa6428fde5ee5899ab6a4758b4120bb1adb2..841d3a9fdc6827486a7f54948e6c63ee4b3b5b1a 100644 (file)
@@ -31,6 +31,11 @@ class JobsController < ApplicationController
     end
   end
 
+  def cancel
+    @object.cancel
+    redirect_to @object
+  end
+
   def show
     generate_provenance([@object])
   end
index 92f3910293695bb537959fbee02c2abd1c972e0e..173d3a06964fb5667b9546aee4bab518baf3c190 100644 (file)
@@ -10,4 +10,8 @@ class Job < ArvadosBase
   def self.creatable?
     false
   end
+
+  def cancel
+    arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {}
+  end
 end
index 660aa9565c8ea1b710d6364946a4c4f7c02f07a6..99f24142ce5b30bc401284412206daaeb11f7048 100644 (file)
@@ -1,27 +1,33 @@
 
 <div class="pull-right">
-Re-run job using version:
-<%= form_tag '/jobs', style: "display:inline; padding-left: 1em" do |f| %>
-<% [:script, :script_version, :repository, :output_is_persistent, :supplied_script_version, :nondeterministic].each do |d| %>
-  <%= hidden_field :job, d, :value => @object[d] %>
-<% end %>
-<% [:script_parameters, :runtime_constraints].each do |d| %>
-  <%= hidden_field :job, d, :value => JSON.dump(@object[d]) %>
-<% end %>
-<%= hidden_field :options, :no_reuse, :value => true %>
-<%= button_tag "Same (#{@object.script_version.slice 0,8}...)", {class: 'btn btn-primary', id: "run-pipeline-button"} %>
-<% end %>
+  <% if @object.running %>
+    <%= form_tag "/jobs/#{@object.uuid}/cancel", style: "display:inline; padding-left: 1em" do |f| %>
+    <%= button_tag "Cancel running job", {class: 'btn btn-danger', id: "cancel-job-button"} %>
+    <% end %>
+  <% else %>
+    Re-run job using version:
+    <%= form_tag '/jobs', style: "display:inline; padding-left: 1em" do |f| %>
+    <% [:script, :script_version, :repository, :output_is_persistent, :supplied_script_version, :nondeterministic].each do |d| %>
+      <%= hidden_field :job, d, :value => @object[d] %>
+    <% end %>
+    <% [:script_parameters, :runtime_constraints].each do |d| %>
+      <%= hidden_field :job, d, :value => JSON.dump(@object[d]) %>
+    <% end %>
+    <%= hidden_field :options, :no_reuse, :value => true %>
+    <%= button_tag "Same (#{@object.script_version.slice 0,8}...)", {class: 'btn btn-primary', id: "re-run-same-job-button"} %>
+  <% end %>
 
-<%= form_tag '/jobs', style: "display:inline" do |f| %>
-<% [:script, :repository, :output_is_persistent, :supplied_script_version, :nondeterministic].each do |d| %>
-  <%= hidden_field :job, d, :value => @object[d] %>
-<% end %>
-<%= hidden_field :job, :script_version, :value => @object[:supplied_script_version] %>
-<% [:script_parameters, :runtime_constraints].each do |d| %>
-  <%= hidden_field :job, d, :value => JSON.dump(@object[d]) %>
+  <%= form_tag '/jobs', style: "display:inline" do |f| %>
+  <% [:script, :repository, :output_is_persistent, :supplied_script_version, :nondeterministic].each do |d| %>
+    <%= hidden_field :job, d, :value => @object[d] %>
+  <% end %>
+  <%= hidden_field :job, :script_version, :value => @object[:supplied_script_version] %>
+  <% [:script_parameters, :runtime_constraints].each do |d| %>
+    <%= hidden_field :job, d, :value => JSON.dump(@object[d]) %>
+  <% end %>
+  <%= hidden_field :options, :no_reuse, :value => true %>
+  <%= button_tag "Latest (#{@object.repository}/#{@object.supplied_script_version})", {class: 'btn btn-primary', id: "re-run-latest-job-button"} %>
 <% end %>
-<%= hidden_field :options, :no_reuse, :value => true %>
-<%= button_tag "Latest (#{@object.repository}/#{@object.supplied_script_version})", {class: 'btn btn-primary', id: "run-pipeline-button"} %>
 <% end %>
 </div>
 
index b4da656bc3a42208764c9a7dfc01f1fd14f82f40..383d4421e2eb0e84e7cd1d14b94ea1e51e739e2a 100644 (file)
@@ -18,7 +18,9 @@ ArvadosWorkbench::Application.routes.draw do
   resources :virtual_machines
   resources :authorized_keys
   resources :job_tasks
-  resources :jobs
+  resources :jobs do
+    post 'cancel', :on => :member
+  end
   match '/logout' => 'sessions#destroy', via: [:get, :post]
   get '/logged_out' => 'sessions#index'
   resources :users do
index f092558cd75c9241c51625b4246a01ec8ed8dce0..5fa5f2bbbafc27a4dc07392da9cf488c778c46a3 100755 (executable)
@@ -640,7 +640,8 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
     $command .= "&& exec arv-mount --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
     if ($docker_image)
     {
-      $command .= "$docker_bin run -i -a stdin -a stdout -a stderr ";
+      $command .= "crunchstat -cgroup-parent=/sys/fs/cgroup/lxc -cgroup-cid=$ENV{TASK_WORK}/docker.cid -poll=1000 ";
+      $command .= "$docker_bin run -i -a stdin -a stdout -a stderr -cidfile=$ENV{TASK_WORK}/docker.cid ";
       # Dynamically configure the container to use the host system as its
       # DNS server.  Get the host's global addresses from the ip command,
       # and turn them into docker --dns options using gawk.
@@ -653,9 +654,13 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
       }
       while (my ($env_key, $env_val) = each %ENV)
       {
-        $command .= "-e \Q$env_key=$env_val\E ";
+        if ($env_key =~ /^(JOB|TASK)_/) {
+          $command .= "-e \Q$env_key=$env_val\E ";
+        }
       }
       $command .= "\Q$docker_image\E ";
+    } else {
+      $command .= "crunchstat -cgroup-path=/sys/fs/cgroup "
     }
     $command .= "$ENV{CRUNCH_SRC}/crunch_scripts/" . $Job->{"script"};
     my @execargs = ('bash', '-c', $command);
index be0669b467c206a0d32ee8095c10784c06e38b2e..87acb651a4347c2900689c296eb20b108f35e213 100755 (executable)
@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'trollop'
+
 include Process
 
 $warned = {}
@@ -20,6 +22,10 @@ if ENV["CRUNCH_DISPATCH_LOCKFILE"]
   end
 end
 
+$trollopts = Trollop::options do
+    opt :use_env, "Pass selected environment variables (PATH, PYTHONPATH, RUBYLIB, GEM_PATH, PERLLIB) to crunch-job"
+end
+
 ENV["RAILS_ENV"] = ARGV[0] || ENV["RAILS_ENV"] || "development"
 
 require File.dirname(__FILE__) + '/../config/boot'
@@ -134,11 +140,23 @@ class Dispatcher
       end
 
       if Server::Application.config.crunch_job_user
-        cmd_args.unshift("sudo", "-E", "-u",
-                         Server::Application.config.crunch_job_user,
-                         "PATH=#{ENV['PATH']}",
-                         "PERLLIB=#{ENV['PERLLIB']}",
-                         "PYTHONPATH=#{ENV['PYTHONPATH']}")
+        cmd_args.unshift("sudo", "-E", "-u", Server::Application.config.crunch_job_user)
+      end
+
+      cmd_args << "HOME=/dev/null"
+      cmd_args << "ARVADOS_API_HOST=#{ENV['ARVADOS_API_HOST']}"
+      cmd_args << "ARVADOS_API_HOST_INSECURE=#{ENV['ARVADOS_API_HOST_INSECURE']}" if ENV['ARVADOS_API_HOST_INSECURE']
+
+      ENV.each do |k, v|
+        cmd_args << "#{k}=#{v}" if k.starts_with? "CRUNCH_"
+      end
+
+      if $trollopts.use_env
+        cmd_args << "PATH=#{ENV['PATH']}"
+        cmd_args << "PYTHONPATH=#{ENV['PYTHONPATH']}"
+        cmd_args << "PERLLIB=#{ENV['PERLLIB']}"
+        cmd_args << "RUBYLIB=#{ENV['RUBYLIB']}"
+        cmd_args << "GEM_PATH=#{ENV['GEM_PATH']}"
       end
 
       job_auth = ApiClientAuthorization.
@@ -178,10 +196,10 @@ class Dispatcher
       cmd_args << '--git-dir'
       cmd_args << arvados_internal
 
-      $stderr.puts "dispatch: #{cmd_args.join ' '}"
+      $stderr.puts "dispatch: #{cmd_args}"
 
       begin
-        i, o, e, t = Open3.popen3(*cmd_args)
+        i, o, e, t = Open3.popen3({}, *cmd_args, { :unsetenv_others => true})
       rescue
         $stderr.puts "dispatch: popen3: #{$!}"
         sleep 1
diff --git a/services/crunch/crunchstat/go.sh b/services/crunch/crunchstat/go.sh
new file mode 100755 (executable)
index 0000000..640a0d2
--- /dev/null
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+# Wraps the 'go' executable with some environment setup.  Sets GOPATH, creates
+# 'pkg' and 'bin' directories, automatically installs dependencies, then runs
+# the underlying 'go' executable with any command line parameters provided to
+# the script.
+
+rootdir=$(readlink -f $(dirname $0))
+GOPATH=$rootdir:$rootdir/../../sdk/go:$GOPATH
+export GOPATH
+
+mkdir -p $rootdir/pkg
+mkdir -p $rootdir/bin
+
+go $*
diff --git a/services/crunch/crunchstat/src/arvados.org/crunchstat/crunchstat.go b/services/crunch/crunchstat/src/arvados.org/crunchstat/crunchstat.go
new file mode 100644 (file)
index 0000000..7528485
--- /dev/null
@@ -0,0 +1,311 @@
+package main
+
+import (
+       "bufio"
+       "flag"
+       "fmt"
+       "io"
+       "io/ioutil"
+       "log"
+       "os"
+       "os/exec"
+       "os/signal"
+       "strings"
+       "syscall"
+       "time"
+)
+
+func ReadLineByLine(inp io.ReadCloser, out chan string, finish chan bool) {
+       s := bufio.NewScanner(inp)
+       for s.Scan() {
+               out <- s.Text()
+       }
+       finish <- true
+}
+
+func OutputChannel(stdout chan string, stderr chan string) {
+       for {
+               select {
+               case s, ok := <-stdout:
+                       if ok {
+                               fmt.Fprintln(os.Stdout, s)
+                       } else {
+                               return
+                       }
+               case s, ok := <-stderr:
+                       if ok {
+                               fmt.Fprintln(os.Stderr, s)
+                       } else {
+                               return
+                       }
+               }
+       }
+}
+
+func PollCgroupStats(cgroup_path string, stderr chan string, poll int64) {
+       //var last_usage int64 = 0
+       var last_user int64 = 0
+       var last_sys int64 = 0
+       var last_cpucount int64 = 0
+
+       type Disk struct {
+               last_read  int64
+               next_read  int64
+               last_write int64
+               next_write int64
+       }
+
+       disk := make(map[string]*Disk)
+
+       //cpuacct_usage := fmt.Sprintf("%s/cpuacct.usage", cgroup_path)
+       cpuacct_stat := fmt.Sprintf("%s/cpuacct.stat", cgroup_path)
+       blkio_io_service_bytes := fmt.Sprintf("%s/blkio.io_service_bytes", cgroup_path)
+       cpuset_cpus := fmt.Sprintf("%s/cpuset.cpus", cgroup_path)
+       memory_stat := fmt.Sprintf("%s/memory.stat", cgroup_path)
+
+       var elapsed int64 = poll
+
+       for {
+               /*{
+                       c, _ := os.Open(cpuacct_usage)
+                       b, _ := ioutil.ReadAll(c)
+                       var next int64
+                       fmt.Sscanf(string(b), "%d", &next)
+                       if last_usage != 0 {
+                               stderr <- fmt.Sprintf("crunchstat: cpuacct.usage %v", (next-last_usage)/10000000)
+                       }
+                       //fmt.Printf("usage %d %d %d %d%%\n", last_usage, next, next-last_usage, (next-last_usage)/10000000)
+                       last_usage = next
+                       c.Close()
+               }*/
+               var cpus int64 = 0
+               {
+                       c, _ := os.Open(cpuset_cpus)
+                       b, _ := ioutil.ReadAll(c)
+                       sp := strings.Split(string(b), ",")
+                       for _, v := range sp {
+                               var min, max int64
+                               n, _ := fmt.Sscanf(v, "%d-%d", &min, &max)
+                               if n == 2 {
+                                       cpus += (max - min) + 1
+                               } else {
+                                       cpus += 1
+                               }
+                       }
+
+                       if cpus != last_cpucount {
+                               stderr <- fmt.Sprintf("crunchstat: cpuset.cpus %v", cpus)
+                       }
+                       last_cpucount = cpus
+
+                       c.Close()
+               }
+               if cpus == 0 {
+                       cpus = 1
+               }
+               {
+                       c, _ := os.Open(cpuacct_stat)
+                       b, _ := ioutil.ReadAll(c)
+                       var next_user int64
+                       var next_sys int64
+                       fmt.Sscanf(string(b), "user %d\nsystem %d", &next_user, &next_sys)
+                       c.Close()
+
+                       if last_user != 0 {
+                               user_diff := next_user - last_user
+                               sys_diff := next_sys - last_sys
+                               // Assume we're reading stats based on 100
+                               // jiffies per second.  Because the ellaspsed
+                               // time is in milliseconds, we need to boost
+                               // that to 1000 jiffies per second, then boost
+                               // it by another 100x to get a percentage, then
+                               // finally divide by the actual elapsed time
+                               // and the number of cpus to get average load
+                               // over the polling period.
+                               user_pct := (user_diff * 10 * 100) / (elapsed * cpus)
+                               sys_pct := (sys_diff * 10 * 100) / (elapsed * cpus)
+
+                               stderr <- fmt.Sprintf("crunchstat: cpuacct.stat user %v", user_pct)
+                               stderr <- fmt.Sprintf("crunchstat: cpuacct.stat sys %v", sys_pct)
+                       }
+
+                       /*fmt.Printf("user %d %d %d%%\n", last_user, next_user, next_user-last_user)
+                       fmt.Printf("sys %d %d %d%%\n", last_sys, next_sys, next_sys-last_sys)
+                       fmt.Printf("sum %d%%\n", (next_user-last_user)+(next_sys-last_sys))*/
+                       last_user = next_user
+                       last_sys = next_sys
+               }
+               {
+                       c, _ := os.Open(blkio_io_service_bytes)
+                       b := bufio.NewScanner(c)
+                       var device, op string
+                       var next int64
+                       for b.Scan() {
+                               if _, err := fmt.Sscanf(string(b.Text()), "%s %s %d", &device, &op, &next); err == nil {
+                                       if disk[device] == nil {
+                                               disk[device] = new(Disk)
+                                       }
+                                       if op == "Read" {
+                                               disk[device].last_read = disk[device].next_read
+                                               disk[device].next_read = next
+                                               if disk[device].last_read > 0 {
+                                                       stderr <- fmt.Sprintf("crunchstat: blkio.io_service_bytes %s read %v", device, disk[device].next_read-disk[device].last_read)
+                                               }
+                                       }
+                                       if op == "Write" {
+                                               disk[device].last_write = disk[device].next_write
+                                               disk[device].next_write = next
+                                               if disk[device].last_write > 0 {
+                                                       stderr <- fmt.Sprintf("crunchstat: blkio.io_service_bytes %s write %v", device, disk[device].next_write-disk[device].last_write)
+                                               }
+                                       }
+                               }
+                       }
+                       c.Close()
+               }
+
+               {
+                       c, _ := os.Open(memory_stat)
+                       b := bufio.NewScanner(c)
+                       var stat string
+                       var val int64
+                       for b.Scan() {
+                               if _, err := fmt.Sscanf(string(b.Text()), "%s %d", &stat, &val); err == nil {
+                                       if stat == "rss" {
+                                               stderr <- fmt.Sprintf("crunchstat: memory.stat rss %v", val)
+                                       }
+                               }
+                       }
+                       c.Close()
+               }
+
+               bedtime := time.Now()
+               time.Sleep(time.Duration(poll) * time.Millisecond)
+               morning := time.Now()
+               elapsed = morning.Sub(bedtime).Nanoseconds() / int64(time.Millisecond)
+       }
+}
+
+func main() {
+
+       var (
+               cgroup_path    string
+               cgroup_parent  string
+               cgroup_cidfile string
+               wait           int64
+               poll           int64
+       )
+
+       flag.StringVar(&cgroup_path, "cgroup-path", "", "Direct path to cgroup")
+       flag.StringVar(&cgroup_parent, "cgroup-parent", "", "Path to parent cgroup")
+       flag.StringVar(&cgroup_cidfile, "cgroup-cid", "", "Path to container id file")
+       flag.Int64Var(&wait, "wait", 5, "Maximum time (in seconds) to wait for cid file to show up")
+       flag.Int64Var(&poll, "poll", 1000, "Polling frequency, in milliseconds")
+
+       flag.Parse()
+
+       logger := log.New(os.Stderr, "crunchstat: ", 0)
+
+       if cgroup_path == "" && cgroup_cidfile == "" {
+               logger.Fatal("Must provide either -cgroup-path or -cgroup-cid")
+       }
+
+       // Make output channel
+       stdout_chan := make(chan string)
+       stderr_chan := make(chan string)
+       finish_chan := make(chan bool)
+       defer close(stdout_chan)
+       defer close(stderr_chan)
+       defer close(finish_chan)
+
+       go OutputChannel(stdout_chan, stderr_chan)
+
+       var cmd *exec.Cmd
+
+       if len(flag.Args()) > 0 {
+               // Set up subprocess
+               cmd = exec.Command(flag.Args()[0], flag.Args()[1:]...)
+
+               logger.Print("Running ", flag.Args())
+
+               // Forward SIGINT and SIGTERM to inner process
+               term := make(chan os.Signal, 1)
+               go func(sig <-chan os.Signal) {
+                       catch := <-sig
+                       if cmd.Process != nil {
+                               cmd.Process.Signal(catch)
+                       }
+                       logger.Print("caught signal:", catch)
+               }(term)
+               signal.Notify(term, syscall.SIGTERM)
+               signal.Notify(term, syscall.SIGINT)
+
+               // Funnel stdout and stderr from subprocess to output channels
+               stdout_pipe, err := cmd.StdoutPipe()
+               if err != nil {
+                       logger.Fatal(err)
+               }
+               go ReadLineByLine(stdout_pipe, stdout_chan, finish_chan)
+
+               stderr_pipe, err := cmd.StderrPipe()
+               if err != nil {
+                       logger.Fatal(err)
+               }
+               go ReadLineByLine(stderr_pipe, stderr_chan, finish_chan)
+
+               // Run subprocess
+               if err := cmd.Start(); err != nil {
+                       logger.Fatal(err)
+               }
+       }
+
+       // Read the cid file
+       if cgroup_cidfile != "" {
+               // wait up to 'wait' seconds for the cid file to appear
+               var i time.Duration
+               for i = 0; i < time.Duration(wait)*time.Second; i += (100 * time.Millisecond) {
+                       f, err := os.Open(cgroup_cidfile)
+                       if err == nil {
+                               cid, err2 := ioutil.ReadAll(f)
+                               if err2 == nil && len(cid) > 0 {
+                                       cgroup_path = string(cid)
+                                       f.Close()
+                                       break
+                               }
+                       }
+                       time.Sleep(100 * time.Millisecond)
+               }
+               if cgroup_path == "" {
+                       logger.Printf("Could not read cid file %s", cgroup_cidfile)
+               }
+       }
+
+       // add the parent prefix
+       if cgroup_parent != "" {
+               cgroup_path = fmt.Sprintf("%s/%s", cgroup_parent, cgroup_path)
+       }
+
+       logger.Print("Using cgroup ", cgroup_path)
+
+       go PollCgroupStats(cgroup_path, stderr_chan, poll)
+
+       // Wait for each of stdout and stderr to drain
+       <-finish_chan
+       <-finish_chan
+
+       if err := cmd.Wait(); err != nil {
+               if exiterr, ok := err.(*exec.ExitError); ok {
+                       // The program has exited with an exit code != 0
+
+                       // This works on both Unix and Windows. Although package
+                       // syscall is generally platform dependent, WaitStatus is
+                       // defined for both Unix and Windows and in both cases has
+                       // an ExitStatus() method with the same signature.
+                       if status, ok := exiterr.Sys().(syscall.WaitStatus); ok {
+                               os.Exit(status.ExitStatus())
+                       }
+               } else {
+                       logger.Fatalf("cmd.Wait: %v", err)
+               }
+       }
+}
index 904fbf1b8d8958804575a0495b35616acc6f79e0..b4afffab061fc2ceaf56bc7dcb93a105fa3d93cb 100755 (executable)
@@ -5,6 +5,7 @@ import arvados
 import subprocess
 import argparse
 import daemon
+import signal
 
 if __name__ == '__main__':
     # Handle command line parameters
@@ -66,7 +67,20 @@ collections on the server.""")
 
         rc = 255
         try:
-            rc = subprocess.call(args.exec_args, shell=False)
+            sp = subprocess.Popen(args.exec_args, shell=False)
+
+            # forward signals to the process.
+            signal.signal(signal.SIGINT, lambda signum, frame: sp.send_signal(signum))
+            signal.signal(signal.SIGTERM, lambda signum, frame: sp.send_signal(signum))
+            signal.signal(signal.SIGQUIT, lambda signum, frame: sp.send_signal(signum))
+
+            # wait for process to complete.
+            rc = sp.wait()
+
+            # restore default signal handlers.
+            signal.signal(signal.SIGINT, signal.SIG_DFL)
+            signal.signal(signal.SIGTERM, signal.SIG_DFL)
+            signal.signal(signal.SIGQUIT, signal.SIG_DFL)
         except OSError as e:
             sys.stderr.write('arv-mount: %s -- exec %s\n' % (str(e), args.exec_args))
             rc = e.errno