Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions ruby/lib/ci/queue/redis/worker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ def idle?

def poll
wait_for_master
if master?
warn "Worker #{worker_id} is the master"
else
master_id = master_worker_id
warn "Worker #{worker_id} saw master worker: #{master_id}" if master_id
end
idle_since = nil
idle_state_printed = false
until shutdown_required? || config.circuit_breakers.any?(&:open?) || exhausted? || max_test_failed?
Expand Down Expand Up @@ -297,6 +303,18 @@ def acquire_master_role?
return true if @master

@master = redis.setnx(key('master-status'), 'setup')
if @master
begin
redis.set(key('master-worker-id'), worker_id)
redis.expire(key('master-worker-id'), config.redis_ttl)
warn "Worker #{worker_id} elected as master"
rescue *CONNECTION_ERRORS
# If setting master-worker-id fails, we still have master status
# Log but don't lose master role
warn("Failed to set master-worker-id: #{$!.message}")
end
end
@master
rescue *CONNECTION_ERRORS
@master = nil
false
Expand Down