hive-runner 2.1.22 → 2.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 216a3488b467928dd26057df38e750217a385cee
-  data.tar.gz: 53e45b27b62accdeac7c55ec6adcc4ee82cc577b
+  metadata.gz: 334ad5a3c278a9cba01ae2ecc59ba974c5630210
+  data.tar.gz: 9d8ab4d1c69a7834f2091351c184848c58f9ef13
 SHA512:
-  metadata.gz: 0bf074173c966e0e639cc9826e787581b8a96afa3674589ed271e57c431b61a75fc22bbd74097aec091c98a8f60ec6be6868c521406422fb8b2d9f91368f0cf7
-  data.tar.gz: dd5a30d68ce66bf0e423ccc164fb289f663300f1379ed5f406b5af7dcea76deb1083708a6d061ca57759904c6939186f1f65b622a2c13f3d8cba76c618844e1f
+  metadata.gz: e3034646eef1aee0aabfdbe406865780543dcc6551a139f5ac3f3eae0feb4d8727187685f154b2b4241c1a8103edfa2828926cedd887bd541d612a0d1308dae0
+  data.tar.gz: 579dd5b3c4f4007e5a9ce6aa463359d4dbf8da1d05de225379ea394fef677696617f10e3174deaf686655f32d4eb52a019e04b8eb68ca13663c821ac788803b6

data/bin/hive_setup

@@ -203,6 +203,7 @@ def setup_hive(options)
     f.puts '    worker_level: INFO'
     f.puts "    home: #{dir}/workspaces"
     f.puts '    homes_to_keep: 5'
+    f.puts '    #hm_logs_to_delete: info'
     f.puts ''
     f.puts '  # Timing configuration'
     f.puts '  timings:'

data/lib/hive/execution_script.rb

@@ -97,10 +97,9 @@ module Hive
         rescue Timeout::Error
           @log.debug("Sub-process keep_running check")
           if ! ( @keep_running.nil? || @keep_running.call )
-             Process.kill(-9, @pgid)
-             raise TimeoutError.new("Timed out after #{Hive.config.timings.job_timeout} seconds")
+            Process.kill(-9, @pgid)
+            raise "Script terminated. Check worker logs for more details"
           end
-          
           # TODO Upload in-progress script logs
         end
       end

data/lib/hive/log.rb

@@ -82,9 +82,9 @@ module Hive
 
     # Currently this will clear the Hive Mind log but do nothing to the local
     # files
-    def clear(component = nil)
+    def clear(options)
       if self.hive_mind
-        self.hive_mind.clear_state component: component
+        self.hive_mind.clear_state(component: options[:component], level: options[:level])
       end
     end
 

data/lib/hive/register.rb

@@ -52,7 +52,7 @@ module Hive
 
         # For the moment, clear Hive Mind logs each time
         # TODO Something better so that warnings and errors are not hidden
-        Hive.logger.clear
+        Hive.logger.clear({component:  Hive.logger.default_progname, level: Hive.config.logging.hm_logs_to_delete})
         Hive.logger.debug('Hive Mind log cleared')
       end
     end

data/lib/hive/worker.rb

@@ -71,7 +71,7 @@ module Hive
       @log.info('Starting worker')
       while keep_worker_running?
         begin
-          @log.clear
+          @log.clear({component: @default_component, level: Hive.config.logging.hm_logs_to_delete})
           update_queues
           poll_queue if diagnostics
         rescue DeviceNotReady => e
@@ -148,7 +148,6 @@ module Hive
 
       @log.info('Job starting')
       @job.prepare(@hive_mind.id)
-      
       exception = nil
       begin
         @log.info "Setting job paths"
@@ -188,11 +187,11 @@ module Hive
         @script.append_bash_cmd @job.command
 
         set_job_state_to :running
-        @job.start
 
         @log.info "Pre-execution setup"
         pre_script(@job, @file_system, @script)
 
+        @job.start
         @log.info "Running execution script"
         exit_value = @script.run
         @job.end(exit_value)
@@ -207,7 +206,6 @@ module Hive
 
         # Upload results
         @file_system.finalise_results_directory
-        upload_files(@job, @file_system.results_path, @file_system.logs_path)
         upload_results(@job, "#{@file_system.testbed_path}/#{@job.execution_directory}", @file_system.results_path)
       rescue => e
         @log.error( "Post execution failed: " + e.message)
@@ -217,9 +215,19 @@ module Hive
       if exception
         @job.error( exception.message )
         set_job_state_to :completed
+        begin
+          upload_files(@job, @file_system.results_path, @file_system.logs_path)
+        rescue => e
+          @log.error("Exception while uploading files: #{e.backtrace.join("\n  : ")}")
+        end
         raise exception
       else
         @job.complete
+        begin
+          upload_files(@job, @file_system.results_path, @file_system.logs_path)
+        rescue => e
+          @log.error("Exception while uploading files: #{e.backtrace.join("\n  : ")}")
+        end
       end
 
       Signal.trap('TERM') do
@@ -316,7 +324,10 @@ module Hive
               config_file: conf_file,
               hive_job_id: job.job_id,
               version: job.execution_variables.version,
-              target: job.execution_variables.queue_name
+              target: job.execution_variables.queue_name,
+              cert: Chamber.env.network.cert,
+              cacert: Chamber.env.network.cafile,
+              ssl_verify_mode: Chamber.env.network.verify_mode
             )
           end
         rescue => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.1.22
+  version: 2.1.24
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chamber