Check cache in Ci::Runner#online?

1 files changed, 8 insertions, 1 deletions

diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index dcbb397fb78..7e616ee9144 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -88,7 +88,10 @@ module Ci
     end
 
     def online?
-      contacted_at && contacted_at > self.class.contact_time_deadline
+      Gitlab::Redis::SharedState.with do |redis|
+        last_seen = redis.get("#{self.runner_info_key}:contacted_at") || contacted_at
+        last_seen && last_seen > self.class.contact_time_deadline
+      end
     end
 
     def status
@@ -152,6 +155,10 @@ module Ci
       ensure_runner_queue_value == value if value.present?
     end
 
+    def runner_info_key
+      "runner:info:#{self.id}"
+    end
+
     private
 
     def cleanup_runner_queue