1 files changed, 56 insertions, 1 deletions

diff --git a/app/models/ci/runner_machine.rb b/app/models/ci/runner_machine.rb
index 1dd997a8ee1..e52659a011f 100644
--- a/app/models/ci/runner_machine.rb
+++ b/app/models/ci/runner_machine.rb
@@ -3,12 +3,24 @@
 module Ci
   class RunnerMachine < Ci::ApplicationRecord
     include FromUnion
+    include RedisCacheable
     include Ci::HasRunnerExecutor
+    include IgnorableColumns
+
+    ignore_column :machine_xid, remove_with: '15.11', remove_after: '2022-03-22'
+
+    # The `UPDATE_CONTACT_COLUMN_EVERY` defines how often the Runner Machine DB entry can be updated
+    UPDATE_CONTACT_COLUMN_EVERY = 40.minutes..55.minutes
 
     belongs_to :runner
 
+    has_many :build_metadata, class_name: 'Ci::BuildMetadata'
+    has_many :builds, through: :build_metadata, class_name: 'Ci::Build'
+    belongs_to :runner_version, inverse_of: :runner_machines, primary_key: :version, foreign_key: :version,
+               class_name: 'Ci::RunnerVersion'
+
     validates :runner, presence: true
-    validates :machine_xid, presence: true, length: { maximum: 64 }
+    validates :system_xid, presence: true, length: { maximum: 64 }
     validates :version, length: { maximum: 2048 }
     validates :revision, length: { maximum: 255 }
     validates :platform, length: { maximum: 255 }
@@ -16,6 +28,8 @@ module Ci
     validates :ip_address, length: { maximum: 1024 }
     validates :config, json_schema: { filename: 'ci_runner_config' }
 
+    cached_attr_reader :version, :revision, :platform, :architecture, :ip_address, :contacted_at, :executor_type
+
     # The `STALE_TIMEOUT` constant defines the how far past the last contact or creation date a runner machine
     # will be considered stale
     STALE_TIMEOUT = 7.days
@@ -29,5 +43,46 @@ module Ci
         where(contacted_some_time_ago),
         remove_duplicates: false).where(created_some_time_ago)
     end
+
+    def heartbeat(values)
+      ##
+      # We can safely ignore writes performed by a runner heartbeat. We do
+      # not want to upgrade database connection proxy to use the primary
+      # database after heartbeat write happens.
+      #
+      ::Gitlab::Database::LoadBalancing::Session.without_sticky_writes do
+        values = values&.slice(:version, :revision, :platform, :architecture, :ip_address, :config, :executor) || {}
+        values[:contacted_at] = Time.current
+        if values.include?(:executor)
+          values[:executor_type] = Ci::Runner::EXECUTOR_NAME_TO_TYPES.fetch(values.delete(:executor), :unknown)
+        end
+
+        version_changed = values.include?(:version) && values[:version] != version
+
+        cache_attributes(values)
+
+        schedule_runner_version_update if version_changed
+
+        # We save data without validation, it will always change due to `contacted_at`
+        update_columns(values) if persist_cached_data?
+      end
+    end
+
+    private
+
+    def persist_cached_data?
+      # Use a random threshold to prevent beating DB updates.
+      contacted_at_max_age = Random.rand(UPDATE_CONTACT_COLUMN_EVERY)
+
+      real_contacted_at = read_attribute(:contacted_at)
+      real_contacted_at.nil? ||
+        (Time.current - real_contacted_at) >= contacted_at_max_age
+    end
+
+    def schedule_runner_version_update
+      return unless version
+
+      Ci::Runners::ProcessRunnerVersionUpdateWorker.perform_async(version)
+    end
   end
 end