hive-runner 2.0.14 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7188b2673a183397d180bc4dfb841ed0c990996d
-  data.tar.gz: c67ad66325a1def914aa3f4ec6ad207a456551a2
+  metadata.gz: bd60ba528c05643c7e7671ec3cda937d892b3173
+  data.tar.gz: 69fc74e7976bcf4456853f84957b1d96396e941d
 SHA512:
-  metadata.gz: a7bd3661e74d00d97dd6eda1c055e7c23888718bae401ac9798357771067c1225cede769966a9a5518d8c7bb475c2e85700810789ed0f9488382669ad1737e97
-  data.tar.gz: 8606ffe8c43ee9aab9af2ea346dd5817377c5a6660486ae12925ba5efb50fc8cbdff3a4fda711f7675da3aeed2cd2b3b8f585d3b99357ebbe0f89b584fe789ff
+  metadata.gz: bea4560f9262e4091e2ac8205f381340da3c05ac18bfd36913a4d6c89b38a4aee55a409b68dce0df70d96c32f49cb651363a4d090c928aac9c053e72180d6e96
+  data.tar.gz: 3bfb69a49c02058d6c1ac65e4c3d9a8b12bed9e2a6696623368ff6ccaa9183e201b182aaea9406e4c0612ee0e17a874ceb17c0a29c7cab337c5d9fef085503bc

data/lib/hive/device.rb

@@ -25,7 +25,7 @@ module Hive
       @worker_pid = Process.fork do
         object = Object
         @worker_class.split('::').each { |sub| object = object.const_get(sub) }
-        object.new(@options.merge('parent_pid' => parent_pid, 'device_identity' => self.identity, 'port_allocator' => self.port_allocator))
+        object.new(@options.merge('parent_pid' => parent_pid, 'device_identity' => self.identity, 'port_allocator' => self.port_allocator, 'hive_id' => Hive.hive_mind.device_details['id']))
       end
       Process.detach @worker_pid
 

data/lib/hive/worker/shell.rb

@@ -5,12 +5,17 @@ module Hive
     # The Shell worker
     class Shell < Worker
       def initialize(options = {})
-        @devicedb_register = false
         super
       end
 
       def pre_script(job, file_system, script)
       end
+
+      # List of autogenerated queues for the worker
+      def autogenerated_queues
+        @options['queues']
+      end
+
     end
   end
 end

data/lib/hive/worker.rb

@@ -29,6 +29,7 @@ module Hive
       @options = options
       @parent_pid = @options['parent_pid']
       @device_id = @options['id']
+      @hive_id = @options['hive_id']
       @hive_mind ||= mind_meld_klass.new(
         url: Chamber.env.network.hive_mind? ? Chamber.env.network.hive_mind : nil,
         pem: Chamber.env.network.cert ? Chamber.env.network.cert : nil,
@@ -44,12 +45,7 @@ module Hive
         "#{LOG_DIRECTORY}/#{pid}.#{@device_identity}.log",
         Hive.config.logging.worker_level || 'INFO'
       )
-      @devicedb_register = true if @devicedb_register.nil?
 
-      # When DeviceDB is dumped in favour of Hive Mind the 'queues' argument
-      # will not be passed in and instead be generated by the
-      # autogenerated_queues method
-      @queues = @options['queues'].class == Array ? @options['queues'] : []
       self.update_queues
 
       @port_allocator = (@options.has_key?('port_allocator') ? @options['port_allocator'] : Hive::PortAllocator.new(ports: []))
@@ -121,7 +117,8 @@ module Hive
     end
 
     def reservation_details
-      { hive_id: Hive.id, worker_pid: Process.pid }
+      @log.debug "Reservations details: hive_id=#{@hive_id}, worker_pid=#{Process.pid}"
+      { hive_id: @hive_id, worker_pid: Process.pid }
     end
 
     # Execute a job
@@ -255,30 +252,12 @@ module Hive
     end
 
     def update_queues
-      if @devicedb_register
-        details = Hive.devicedb('Device').find(@options['id'])
-        @log.debug("Device details: #{details.inspect}")
-
-        if details['device_queues']
-          new_queues = details['device_queues'].collect do |queue_details|
-            queue_details['name']
-          end
-          if @queues.sort != new_queues.sort
-            @log.info("Updated queue list: #{new_queues.join(', ')}")
-            @queues = new_queues
-          end
-          update_queue_log
-        else
-          @log.warn("Queue list missing from DeviceDB response")
-        end
-      end
-
       # Get Queues from Hive Mind
-      #@log.debug("Getting queues from Hive Mind")
-      #@queues = (autogenerated_queues + @hive_mind.hive_queues(true)).uniq
-      #@log.debug("hive queues: #{@hive_mind.hive_queues}")
-      #@log.debug("Full list of queues: #{@queues}")
-      #update_queue_log
+      @log.debug("Getting queues from Hive Mind")
+      @queues = (autogenerated_queues + @hive_mind.hive_queues(true)).uniq
+      @log.debug("hive queues: #{@hive_mind.hive_queues}")
+      @log.debug("Full list of queues: #{@queues}")
+      update_queue_log
     end
     
     def update_queue_log

data/lib/hive.rb

@@ -1,7 +1,6 @@
 require 'chamber'
 require 'hive/log'
 require 'hive/register'
-require 'devicedb_comms'
 require 'mind_meld/hive'
 require 'macaddr'
 require 'socket'
@@ -33,12 +32,6 @@ module Hive
     fail 'Missing logging section in configuration file'
   end
 
-  DeviceDBComms.configure do |config|
-    config.url = Chamber.env.network.devicedb
-    config.pem_file = Chamber.env.network.cert
-    config.ssl_verify_mode = OpenSSL::SSL::VERIFY_NONE
-  end
-
   Airbrake.configure do |config|
      config.host = Chamber.env.errbit.host
      config.project_id = Chamber.env.errbit.project_id
@@ -63,11 +56,6 @@ module Hive
     @logger
   end
 
-  def self.devicedb(section)
-    @devicedb = {} if ! @devicedb.kind_of?(Hash)
-    @devicedb[section] ||= Object.const_get('DeviceDBComms').const_get(section).new()
-  end
-
   def self.hive_mind
     Hive.logger.debug "Sysname: #{Sys::Uname.sysname}"
     Hive.logger.debug "Release: #{Sys::Uname.release}"
@@ -95,45 +83,9 @@ module Hive
     @register ||= Hive::Register.new
   end
 
-  # Get the id of the hive from the device database
-  def self.id
-    if ! @devicedb_id
-      Hive.logger.info "Attempting to register the hive as #{Hive.hostname}"
-      register_response = self.devicedb('Hive').register(Hive.hostname, Hive.mac_address, Hive.ip_address)
-      if register_response['error'].present?
-        Hive.logger.warn 'Hive failed to register'
-        Hive.logger.warn "  - #{register_response['error']}"
-      else
-        Hive.logger.info "Hive registered with id #{register_response['id']}"
-        @devicedb_id = register_response['id']
-      end
-    end
-    @devicedb_id || -1
-  end
-
   # Poll the device database
   def self.poll
-    # DeviceDB
-    id = self.id
-    if id and  id > 0
-      Hive.logger.debug "Polling hive: #{id}"
-      rtn = Hive.devicedb('Hive').poll(id)
-      Hive.logger.debug "Return data: #{rtn}"
-      if rtn['error'].present?
-        Hive.logger.warn "Hive polling failed: #{rtn['error']}"
-      else
-        Hive.logger.info "Successfully polled hive"
-      end
-    else
-      if id
-        Hive.logger.debug "Skipping polling of hive"
-      else
-        Hive.logger.warn "Unable to poll hive"
-      end
-    end
-
-    # Hive Mind
-    Hive.logger.debug "Polling hive: #{id}"
+    Hive.logger.debug "Polling hive"
     rtn = Hive.hive_mind.poll
     Hive.logger.debug "Return data: #{rtn}"
     if rtn['error'].present?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.1.0
 platform: ruby
 authors:
 - Joe Haig