cosmos 4.2.3-java → 4.2.4-java

data/lib/cosmos/dart/lib/dart_decommutator.rb

@@ -12,6 +12,24 @@ require 'dart_common'
 require 'dart_logging'
 require 'packet_log_entry'
 
+class DartDecommutatorStatus
+  attr_accessor :count
+  attr_accessor :error_count
+  attr_accessor :message
+  attr_accessor :message_time
+
+  def initialize
+    @count = 0
+    @error_count = 0
+    @message = ''
+    @message_time = Time.now
+    @cached_meta_ple = nil
+    @cached_system_meta = nil
+    @cached_system_meta_id = nil
+    @cached_system_config = nil
+  end
+end
+
 class DartDecommutator
   include DartCommon
 
@@ -22,10 +40,12 @@ class DartDecommutator
     sync_targets_and_packets()
     @worker_id = worker_id
     @num_workers = num_workers
+    @status = DartDecommutatorStatus.new
   end
 
   # Run forever looking for data to decommutate
   def run
+    status_time = Time.now + 60.seconds
     while true
       time_start = Time.now # Remember start time so we can throttle
       # Get all entries that are ready and decommutation hasn't started
@@ -34,7 +54,6 @@ class DartDecommutator
                      where("id % #{@num_workers} = #{@worker_id}").in_batches do |group|
         group.each do |ple|
           begin
-            # TODO - Optimize and cache meta and system config and packet config lookup
             meta_ple = get_meta_ple(ple)
             next unless meta_ple
             system_meta = get_system_meta(ple, meta_ple)
@@ -48,12 +67,28 @@ class DartDecommutator
             # If we timeout this code will simply exit the application
             wait_for_ready_packet_config(packet_config)
             decom_packet(ple, packet, packet_config)
+
+            # Update status
+            if Time.now > status_time
+              status_time = Time.now + 60.seconds
+              status = Status.first
+              if (Time.now - @status.message_time) <= 60.0
+                status.decom_message = @status.message
+                status.decom_message_time = @status.message_time
+                status.save!
+              end
+              if @status.count > 0 or @status.error_count > 0
+                Status.update_counters(status.id, :decom_count => @status.count, :decom_error_count => @status.error_count)
+                @status.count = 0
+                @status.error_count = 0
+              end
+            end
           rescue => err
-            Cosmos::Logger.error("PLE:#{ple.id}:ERROR")
-            Cosmos::Logger.error(err.formatted)
+            handle_error("PLE:#{ple.id}:ERROR\n#{err.formatted}")
           end
         end # each ple
       end # batches
+
       # Throttle to no faster than 1 Hz
       delta = Time.now - time_start
       sleep(1 - delta) if delta < 1 && delta > 0
@@ -65,46 +100,61 @@ class DartDecommutator
   protected
 
   def get_meta_ple(ple)
+    return @cached_meta_ple if @cached_meta_ple and @cached_meta_ple.id == ple.meta_id
+
     if ple.meta_id != ple.id
-      PacketLogEntry.find(ple.meta_id)
+      meta_ple = PacketLogEntry.find(ple.meta_id)
     else
-      ple
+      meta_ple = ple
     end
+    @cached_meta_ple = meta_ple
+    return meta_ple
   rescue => err
     ple.decom_state = PacketLogEntry::NO_META_PLE
     ple.save!
-    Cosmos::Logger.error("PLE:#{ple.id}:#{ple.decom_state_string}")
+    handle_error("PLE:#{ple.id}:#{ple.decom_state_string}")
     nil
   end
 
   def get_system_meta(ple, meta_ple)
+    return @cached_system_meta if @cached_system_meta and @cached_system_meta_id == meta_ple.id
+
     system_meta = read_packet_from_ple(meta_ple)
-    return system_meta if system_meta
+    if system_meta
+      @cached_system_meta_id = meta_ple.id
+      @cached_system_meta = system_meta
+      return system_meta
+    end
 
     ple.decom_state = PacketLogEntry::NO_META_PACKET
     ple.save!
-    Cosmos::Logger.error("PLE:#{ple.id}:#{ple.decom_state_string}")
+    handle_error("PLE:#{ple.id}:#{ple.decom_state_string}")
     nil
   end
 
   def get_system_config(ple, system_meta)
     system_config_name = system_meta.read("CONFIG")
-    system_config = SystemConfig.where("name = ?", system_config_name).first
-    unless system_config
-      begin
-        # Try to create a new SystemConfig since it didn't exist
-        system_config = SystemConfig.create(:name => system_config_name)
-      rescue
-        # Another thread probably already created it - Try to get it one more time
-        system_config = SystemConfig.where("name = ?", system_config_name).first
+    if @cached_system_config and @cached_system_config.name == system_config_name
+      system_config = @cached_system_config
+    else
+      system_config = SystemConfig.where("name = ?", system_config_name).first
+      unless system_config
+        begin
+          # Try to create a new SystemConfig since it didn't exist
+          system_config = SystemConfig.create(:name => system_config_name)
+        rescue
+          # Another thread probably already created it - Try to get it one more time
+          system_config = SystemConfig.where("name = ?", system_config_name).first
+        end
       end
     end
     unless system_config
       ple.decom_state = PacketLogEntry::NO_SYSTEM_CONFIG
       ple.save!
-      Cosmos::Logger.error("PLE:#{ple.id}:#{ple.decom_state_string}")
+      handle_error("PLE:#{ple.id}:#{ple.decom_state_string}")
       return nil
     end
+    @cached_system_config = system_config
 
     # Switch to this system_config
     begin
@@ -113,7 +163,7 @@ class DartDecommutator
       Cosmos::Logger.error("Could not load system_config: #{system_config_name}")
       ple.decom_state = PacketLogEntry::NO_CONFIG
       ple.save!
-      Cosmos::Logger.error("PLE:#{ple.id}:#{ple.decom_state_string}")
+      handle_error("PLE:#{ple.id}:#{ple.decom_state_string}")
       return nil
     end
     system_config
@@ -125,7 +175,7 @@ class DartDecommutator
 
     ple.decom_state = PacketLogEntry::NO_PACKET
     ple.save!
-    Cosmos::Logger.error("PLE:#{ple.id}:#{ple.decom_state_string}")
+    handle_error("PLE:#{ple.id}:#{ple.decom_state_string}")
     nil
   end
 
@@ -141,14 +191,14 @@ class DartDecommutator
       setup_packet_config(packet, packet_id, packet_config)
       Cosmos::Logger.info("Successfully Created PacketConfig: #{packet.config_name}")
     rescue => err
-      Cosmos::Logger.error(err.formatted)
+      handle_error(err.formatted)
       # Another thread probably already created it - Try to get it one more time
       packet_config = PacketConfig.where("packet_id = ? and name = ?", packet_id, packet.config_name).first
     end
     unless packet_config
       ple.decom_state = PacketLogEntry::NO_PACKET_CONFIG
       ple.save!
-      Cosmos::Logger.error("PLE:#{ple.id}:#{ple.decom_state_string}")
+      handle_error("PLE:#{ple.id}:#{ple.decom_state_string}")
       return nil
     end
     packet_config
@@ -167,7 +217,7 @@ class DartDecommutator
       packet_config.reload
 
       if (Time.now - ready_wait_start) > PACKET_CONFIG_READY_TIMEOUT
-        Cosmos::Logger.fatal("Timeout waiting for ready on PacketConfig:#{packet_config.id}")
+        handle_error("Timeout waiting for ready on PacketConfig:#{packet_config.id}")
         exit(1)
       end
     end
@@ -211,6 +261,7 @@ class DartDecommutator
       row = model.new
       row.time = ple.time
       row.ple_id = ple.id
+      row.packet_log_id = ple.packet_log_id
       row.meta_id = ple.meta_id
       row.reduced_state = INITIALIZING
       table_values.each_with_index do |value, index|
@@ -230,6 +281,14 @@ class DartDecommutator
     # The log entry has been decommutated, mark COMPLETE
     ple.decom_state = PacketLogEntry::COMPLETE
     ple.save!
+    @status.count += 1
     Cosmos::Logger.debug("PLE:#{ple.id}:#{ple.decom_state_string}")
   end
+
+  def handle_error(message)
+    Cosmos::Logger.error(message)
+    @status.error_count += 1
+    @status.message = message
+    @status.message_time = Time.now
+  end
 end

data/lib/cosmos/dart/lib/dart_importer.rb

@@ -80,10 +80,12 @@ class DartImporter
       Cosmos::Logger.info("First and Last Packet in File not in database")
 
       # Check if time range of packets is not present in database
-      ple = PacketLogEntry.where("time >= ? or time <= ?", first_packet.received_time, last_packet.received_time).first
+      ple = PacketLogEntry.where("time >= ? and time <= ?", first_packet.received_time, last_packet.received_time).first
       if !ple # Can go fast if not present at all
         Cosmos::Logger.info("  Fast Import Enabled...")
         fast = true
+      else
+        Cosmos::Logger.warn("Time range already in database. Will verify each packet before adding")
       end
     else
       Cosmos::Logger.warn("File partially in database. Will verify each packet before adding")
@@ -97,6 +99,8 @@ class DartImporter
     # Read File and Create PacketLogEntries
     count = 0
     meta_id = nil
+    ple_data = ""
+    ple_data_count = 0
     plr.open(filename)
     data_offset = plr.bytes_read
     plr.each(filename) do |packet|
@@ -117,27 +121,39 @@ class DartImporter
 
       # No PacketLogEntry was found so create one from scratch
       unless ple
-        ple = PacketLogEntry.new
-        ple.target_id = target_id
-        ple.packet_id = packet_id
-        ple.time = packet.received_time
-        ple.packet_log_id = packet_log.id
-        ple.data_offset = data_offset
-        ple.meta_id = meta_id
-        ple.is_tlm = is_tlm
-        ple.ready = true
-        ple.save!
-        count += 1
-
         # SYSTEM META packets are special in that their meta_id is their own
         # PacketLogEntry ID from the database. All other packets have meta_id
         # values which point back to the last SYSTEM META PacketLogEntry ID.
         if target_name == 'SYSTEM'.freeze and packet_name == 'META'.freeze
+          if ple_data.length > 0
+            ActiveRecord::Base.connection.execute("INSERT INTO packet_log_entries (target_id, packet_id, time, packet_log_id, data_offset, meta_id, is_tlm, ready) VALUES #{ple_data}")
+            ple_data.clear
+            ple_data_count = 0
+          end
+
+          ple = PacketLogEntry.new
+          ple.target_id = target_id
+          ple.packet_id = packet_id
+          ple.time = packet.received_time
+          ple.packet_log_id = packet_log.id
+          ple.data_offset = data_offset
+          ple.meta_id = meta_id
+          ple.is_tlm = is_tlm
+          ple.ready = false
+          ple.save!(validate: false)
+
           # Need to update meta_id for this and all subsequent packets
           meta_id = ple.id
           ple.meta_id = meta_id
-          ple.save!
+          ple.ready = true
+          ple.save!(validate: false)
+        else
+          ple_data << "," if ple_data.length > 0
+          ple_data << "(#{target_id},#{packet_id},'#{packet.received_time.dup.utc.iso8601(6)}',#{packet_log.id},#{data_offset},#{meta_id},#{is_tlm},true)"
+          ple_data_count += 1
         end
+
+        count += 1
       else # A PacketLogEntry was found so this packet is skipped
         # If the packet is a SYSTEM META packet we keep track of the meta_id
         # for use in subsequent packets that aren't already in the database.
@@ -146,8 +162,22 @@ class DartImporter
           meta_id = ple.id
         end
       end
+
+      if ple_data_count >= 1000
+        ActiveRecord::Base.connection.execute("INSERT INTO packet_log_entries (target_id, packet_id, time, packet_log_id, data_offset, meta_id, is_tlm, ready) VALUES #{ple_data}")
+        ple_data.clear
+        ple_data_count = 0
+      end
+
       data_offset = plr.bytes_read
     end
+
+    if ple_data.length > 0
+      ActiveRecord::Base.connection.execute("INSERT INTO packet_log_entries (target_id, packet_id, time, packet_log_id, data_offset, meta_id, is_tlm, ready) VALUES #{ple_data}")
+      ple_data.clear
+      ple_data_count = 0
+    end
+
     Cosmos::Logger.info("Added #{count} packet log entries to database")
     return 0 # Success code
   end

data/lib/cosmos/dart/lib/dart_packet_log_writer.rb

@@ -29,7 +29,13 @@ class DartPacketLogWriter < Cosmos::PacketLogWriter
     @db_queue = Queue.new
     @sync_count = 0
     @sync_count_limit = DEFAULT_SYNC_COUNT_LIMIT
-    @not_ready_ple_ids = []
+    @ple_data = ""
+    @sync_ple = nil
+    if @log_type == :TLM
+      @is_tlm = true
+    else
+      @is_tlm = false
+    end
 
     sync_targets_and_packets()
 
@@ -42,6 +48,13 @@ class DartPacketLogWriter < Cosmos::PacketLogWriter
   def shutdown
     super()
     Cosmos.kill_thread(self, @db_thread)
+    handle_sync_ple()
+    queue_ple_data()
+    while @db_queue.length > 0
+      ple_data = @db_queue.pop
+      break if ple_data.nil?
+      ActiveRecord::Base.connection.execute("INSERT INTO packet_log_entries (target_id, packet_id, time, packet_log_id, data_offset, meta_id, is_tlm, ready) VALUES #{ple_data}")
+    end
   end
 
   # Kick the database update thread to allow it to quit
@@ -54,33 +67,75 @@ class DartPacketLogWriter < Cosmos::PacketLogWriter
 
   # Override the default new file hook to create a PacketLog entry in the database
   def start_new_file_hook(packet)
-    # When we create a new file we mark any existing PLEs ready
-    PacketLogEntry.where("id" => @not_ready_ple_ids).update_all(ready: true)
-    @not_ready_ple_ids.clear
-    @sync_count = 0
+    # When we create a new file we write out any queued ple_data
+    if @ple_data.length > 0
+      @db_queue << @ple_data.clone
+      @ple_data.clear
+      @sync_count = 0
+    end
 
     packet_log = PacketLog.new
     packet_log.filename = @filename.clone
-    if @log_type == :TLM
-      packet_log.is_tlm = true
-    else
-      packet_log.is_tlm = false
-    end
+    packet_log.is_tlm = @is_tlm
     packet_log.save!
     @packet_log_id = packet_log.id
     super(packet)
   end
 
+  def queue_ple_data
+    if @ple_data.length > 0
+      @db_queue << @ple_data.clone
+      @ple_data.clear
+      @sync_count = 0
+    end
+  end
+
+  def handle_sync_ple
+    if @sync_ple
+      @file.fsync if @file
+      @sync_ple.ready = true
+      @sync_ple.save!
+      @sync_ple = nil
+      queue_ple_data()
+    end
+  end
+
   # Override the default pre write hook to pop a message on the queue which
   # will be processed by the database thread. This also writes out the log
   # files to disk periodically for use by other DART processes.
   def pre_write_entry_hook(packet)
-    @sync_count += 1
-    if @sync_count > @sync_count_limit
-      @file.fsync
-      @sync_count = 0
+    handle_sync_ple()
+
+    # SYSTEM META packets are special in that their meta_id is their own
+    # PacketLogEntry ID from the database. All other packets have meta_id
+    # values which point back to the last SYSTEM META PacketLogEntry ID.
+    target_id, packet_id = lookup_target_and_packet_id(packet.target_name, packet.packet_name, @is_tlm)
+    if packet.target_name == 'SYSTEM'.freeze and packet.packet_name == 'META'.freeze
+      ple = PacketLogEntry.new
+      ple.target_id = target_id
+      ple.packet_id = packet_id
+      ple.time = packet.received_time
+      ple.packet_log_id = @packet_log_id
+      ple.data_offset = @file_size
+      ple.meta_id = @meta_id
+      ple.is_tlm = @is_tlm
+      ple.ready = false
+      ple.save!
+      @meta_id = ple.id
+      ple.meta_id = @meta_id
+      ple.save!
+      @sync_ple = ple
+    else
+      @sync_count += 1
+      if @sync_count > @sync_count_limit
+        @file.fsync
+        @db_queue << @ple_data.clone
+        @ple_data.clear
+        @sync_count = 0
+      end
+      @ple_data << "," if @ple_data.length > 0
+      @ple_data << "(#{target_id},#{packet_id},'#{packet.received_time.dup.utc.iso8601(6)}',#{@packet_log_id},#{@file_size},#{@meta_id},#{@is_tlm},true)"
     end
-    @db_queue << [packet.target_name, packet.packet_name, packet.received_time, @file_size, @packet_log_id, @sync_count]
   end
 
   # Build the target / packet table lookup table and then wait on the queue
@@ -88,52 +143,15 @@ class DartPacketLogWriter < Cosmos::PacketLogWriter
   # PacketLogEntry table. Each entry identifies a packet in the log file by
   # its target, packet, time, and data offset (among other things).
   def db_thread_body
-    if @log_type == :TLM
-      is_tlm = true
-    else
-      is_tlm = false
-    end
-
     while true
       begin
-        target_name, packet_name, time, data_offset, packet_log_id, sync_count = @db_queue.pop
-        # Every time the sync_count resets by the pre_write_entry_hook the file
-        # is written out to disk. Thus we mark all the PacketLogEntrys to ready
-        # since we know the packets have been written to disk.
-        if sync_count == 0 or sync_count.nil?
-          PacketLogEntry.where("id" => @not_ready_ple_ids).update_all(ready: true)
-          @not_ready_ple_ids.clear
-        end
-        return if @cancel_threads or sync_count.nil?
+        ple_data = @db_queue.pop
+        return if @cancel_threads or ple_data.nil?
+        ActiveRecord::Base.connection.execute("INSERT INTO packet_log_entries (target_id, packet_id, time, packet_log_id, data_offset, meta_id, is_tlm, ready) VALUES #{ple_data}")
       rescue ThreadError
         # This can happen when the thread is killed
         return
       end
-
-      target_id, packet_id = lookup_target_and_packet_id(target_name, packet_name, is_tlm)
-
-      ple = PacketLogEntry.new
-      ple.target_id = target_id
-      ple.packet_id = packet_id
-      ple.time = time
-      ple.packet_log_id = packet_log_id
-      ple.data_offset = data_offset
-      ple.meta_id = @meta_id
-      ple.is_tlm = is_tlm
-      ple.ready = false
-      ple.save!
-
-      # SYSTEM META packets are special in that their meta_id is their own
-      # PacketLogEntry ID from the database. All other packets have meta_id
-      # values which point back to the last SYSTEM META PacketLogEntry ID.
-      if target_name == 'SYSTEM'.freeze and packet_name == 'META'.freeze
-        # Need to update meta_id for this and all subsequent packets
-        @meta_id = ple.id
-        ple.meta_id = @meta_id
-        ple.save!
-      end
-      # Remember this new PacketLogEntry so we can mark it ready later
-      @not_ready_ple_ids << ple.id
     end
   end
 end