Merge pull request #1 from curoverse/master

[arvados.git] / services / api / script / crunch-dispatch.rb

diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index 6faf931b28d0fed1587355a4125945befd3d37d6..ab4f70e60bd1115a87a47eeed64a544859bf49fd 100755 (executable)
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -52,7 +52,6 @@ end
 
 class Dispatcher
   include ApplicationHelper
-  include DbCurrentTime
 
   def initialize
     @crunch_job_bin = (ENV['CRUNCH_JOB_BIN'] || `which arv-crunch-job`.strip)
@@ -217,7 +216,7 @@ class Dispatcher
     nodelist = nodes_available_for_job_now(job)
     if nodelist.nil? and not did_recently(:wait_for_available_nodes, 3600)
       $stderr.puts "dispatch: waiting for nodes for #{job.uuid}"
-      @node_wait_deadline = db_current_time + 5.minutes
+      @node_wait_deadline = Time.now + 5.minutes
     end
     nodelist
   end
@@ -261,7 +260,7 @@ class Dispatcher
       # We already made a token for this job, but we need a new one
       # because modified_by_user_uuid has changed (the job will run
       # as a different user).
-      @authorizations[job.uuid].update_attributes expires_at: db_current_time
+      @authorizations[job.uuid].update_attributes expires_at: Time.now
       @authorizations[job.uuid] = nil
     end
     if not @authorizations[job.uuid]
@@ -357,7 +356,7 @@ class Dispatcher
       when :slurm_immediate
         nodelist = nodes_available_for_job(job)
         if nodelist.nil?
-          if db_current_time < @node_wait_deadline
+          if Time.now < @node_wait_deadline
             break
           else
             next
@@ -427,7 +426,7 @@ class Dispatcher
         bytes_logged: 0,
         events_logged: 0,
         log_throttle_is_open: true,
-        log_throttle_reset_time: db_current_time + Rails.configuration.crunch_log_throttle_period,
+        log_throttle_reset_time: Time.now + Rails.configuration.crunch_log_throttle_period,
         log_throttle_bytes_so_far: 0,
         log_throttle_lines_so_far: 0,
         log_throttle_bytes_skipped: 0,
@@ -451,18 +450,18 @@ class Dispatcher
       if (running_job[:bytes_logged] >
           Rails.configuration.crunch_limit_log_bytes_per_job)
         message = "Exceeded log limit #{Rails.configuration.crunch_limit_log_bytes_per_job} bytes (crunch_limit_log_bytes_per_job). Log will be truncated."
-        running_job[:log_throttle_reset_time] = db_current_time + 100.years
+        running_job[:log_throttle_reset_time] = Time.now + 100.years
         running_job[:log_throttle_is_open] = false
 
       elsif (running_job[:log_throttle_bytes_so_far] >
              Rails.configuration.crunch_log_throttle_bytes)
-        remaining_time = running_job[:log_throttle_reset_time] - db_current_time
+        remaining_time = running_job[:log_throttle_reset_time] - Time.now
         message = "Exceeded rate #{Rails.configuration.crunch_log_throttle_bytes} bytes per #{Rails.configuration.crunch_log_throttle_period} seconds (crunch_log_throttle_bytes). Logging will be silenced for the next #{remaining_time.round} seconds.\n"
         running_job[:log_throttle_is_open] = false
 
       elsif (running_job[:log_throttle_lines_so_far] >
              Rails.configuration.crunch_log_throttle_lines)
-        remaining_time = running_job[:log_throttle_reset_time] - db_current_time
+        remaining_time = running_job[:log_throttle_reset_time] - Time.now
         message = "Exceeded rate #{Rails.configuration.crunch_log_throttle_lines} lines per #{Rails.configuration.crunch_log_throttle_period} seconds (crunch_log_throttle_lines), logging will be silenced for the next #{remaining_time.round} seconds.\n"
         running_job[:log_throttle_is_open] = false
       end
@@ -487,7 +486,7 @@ class Dispatcher
     @running.each do |job_uuid, j|
       job = j[:job]
 
-      now = db_current_time
+      now = Time.now
       if now > j[:log_throttle_reset_time]
         # It has been more than throttle_period seconds since the last
         # checkpoint so reset the throttle
@@ -664,7 +663,7 @@ class Dispatcher
     # Invalidate the per-job auth token, unless the job is still queued and we
     # might want to try it again.
     if jobrecord.state != "Queued"
-      j_done[:job_auth].update_attributes expires_at: db_current_time
+      j_done[:job_auth].update_attributes expires_at: Time.now
     end
 
     @running.delete job_done.uuid
@@ -681,7 +680,7 @@ class Dispatcher
     end
 
     expire_tokens.each do |k, v|
-      v.update_attributes expires_at: db_current_time
+      v.update_attributes expires_at: Time.now
       @pipe_auth_tokens.delete k
     end
   end
@@ -722,9 +721,8 @@ class Dispatcher
   protected
 
   def did_recently(thing, min_interval)
-    current_time = db_current_time
-    if !@did_recently[thing] or @did_recently[thing] < current_time - min_interval
-      @did_recently[thing] = current_time
+    if !@did_recently[thing] or @did_recently[thing] < Time.now - min_interval
+      @did_recently[thing] = Time.now
       false
     else
       true
@@ -739,7 +737,7 @@ class Dispatcher
     # it has been at least crunch_log_seconds_between_events seconds since
     # the last flush.
     if running_job[:stderr_buf_to_flush].size > Rails.configuration.crunch_log_bytes_per_event or
-        (db_current_time - running_job[:stderr_flushed_at]) >= Rails.configuration.crunch_log_seconds_between_events
+        (Time.now - running_job[:stderr_flushed_at]) >= Rails.configuration.crunch_log_seconds_between_events
       begin
         log = Log.new(object_uuid: running_job[:job].uuid,
                       event_type: 'stderr',
@@ -752,7 +750,7 @@ class Dispatcher
         $stderr.puts exception.backtrace
       end
       running_job[:stderr_buf_to_flush] = ''
-      running_job[:stderr_flushed_at] = db_current_time
+      running_job[:stderr_flushed_at] = Time.now
     end
   end
 end