Set expire on set

Author: ChrisBr

ruby/lib/ci/queue/redis/base.rb

@@ -8,9 +8,11 @@ class Base
         TEN_MINUTES = 60 * 10
         CONNECTION_ERRORS = [
           ::Redis::BaseConnectionError,
-          RedisClient::ConnectionError,
           ::SocketError, # https://github.com/redis/redis-rb/pull/631
-        ].freeze
+        ]
+
+        # https://github.com/redis/redis-rb/pull/1312
+        CONNECTION_ERRORS << RedisClient::ConnectionError if defined?(RedisClient::ConnectionError)
 
         module RedisInstrumentation
           def call(command, redis_config)

ruby/lib/ci/queue/redis/worker.rb

@@ -212,12 +212,10 @@ def push(tests)
                   begin
                     redis.multi do |transaction|
                       transaction.lpush(key('queue'), tests) unless tests.empty?
-                      transaction.set(key('total'), @total)
-                      transaction.set(key('master-status'), 'ready')
+                      transaction.set(key('total'), @total, ex: config.redis_ttl)
+                      transaction.set(key('master-status'), 'ready', ex: config.redis_ttl)
 
                       transaction.expire(key('queue'), config.redis_ttl)
-                      transaction.expire(key('total'), config.redis_ttl)
-                      transaction.expire(key('master-status'), config.redis_ttl)
                     end
                   rescue ::Redis::BaseError, RedisClient::Error => error
                     if !queue_initialized? && attempts < 3