Commit 233cf070 authored by Dylan Griffith's avatar Dylan Griffith

Remove redundant code and increase delay for ClusterWaitForIngressIpAddressWorker (#42643)

parent 20897ebc
...@@ -14,13 +14,13 @@ module Clusters ...@@ -14,13 +14,13 @@ module Clusters
nginx: 1 nginx: 1
} }
IP_ADDRESS_FETCH_RETRIES = 3 FETCH_IP_ADDRESS_DELAY = 30.seconds
state_machine :status do state_machine :status do
before_transition any => [:installed] do |application| before_transition any => [:installed] do |application|
application.run_after_commit do application.run_after_commit do
ClusterWaitForIngressIpAddressWorker.perform_in( ClusterWaitForIngressIpAddressWorker.perform_in(
ClusterWaitForIngressIpAddressWorker::INTERVAL, application.name, application.id, IP_ADDRESS_FETCH_RETRIES) FETCH_IP_ADDRESS_DELAY, application.name, application.id)
end end
end end
end end
...@@ -41,8 +41,7 @@ module Clusters ...@@ -41,8 +41,7 @@ module Clusters
return unless installed? return unless installed?
return if external_ip return if external_ip
ClusterWaitForIngressIpAddressWorker.perform_async( ClusterWaitForIngressIpAddressWorker.perform_async(name, id)
name, id, IP_ADDRESS_FETCH_RETRIES)
end end
end end
end end
......
...@@ -3,9 +3,7 @@ class ClusterWaitForIngressIpAddressWorker ...@@ -3,9 +3,7 @@ class ClusterWaitForIngressIpAddressWorker
include ClusterQueue include ClusterQueue
include ClusterApplications include ClusterApplications
INTERVAL = 30.seconds def perform(app_name, app_id)
def perform(app_name, app_id, retries_remaining)
find_application(app_name, app_id) do |app| find_application(app_name, app_id) do |app|
Clusters::Applications::CheckIngressIpAddressService.new(app).execute Clusters::Applications::CheckIngressIpAddressService.new(app).execute
end end
......
...@@ -20,7 +20,7 @@ describe Clusters::Applications::Ingress do ...@@ -20,7 +20,7 @@ describe Clusters::Applications::Ingress do
it 'schedules a ClusterWaitForIngressIpAddressWorker' do it 'schedules a ClusterWaitForIngressIpAddressWorker' do
expect(ClusterWaitForIngressIpAddressWorker).to have_received(:perform_in) expect(ClusterWaitForIngressIpAddressWorker).to have_received(:perform_in)
.with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', application.id, 3) .with(Clusters::Applications::Ingress::FETCH_IP_ADDRESS_DELAY, 'ingress', application.id)
end end
end end
...@@ -33,7 +33,7 @@ describe Clusters::Applications::Ingress do ...@@ -33,7 +33,7 @@ describe Clusters::Applications::Ingress do
it 'schedules a ClusterWaitForIngressIpAddressWorker' do it 'schedules a ClusterWaitForIngressIpAddressWorker' do
expect(ClusterWaitForIngressIpAddressWorker).to have_received(:perform_async) expect(ClusterWaitForIngressIpAddressWorker).to have_received(:perform_async)
.with('ingress', application.id, 3) .with('ingress', application.id)
end end
context 'when the application is not installed' do context 'when the application is not installed' do
......
...@@ -22,7 +22,7 @@ describe ClusterWaitForIngressIpAddressWorker do ...@@ -22,7 +22,7 @@ describe ClusterWaitForIngressIpAddressWorker do
end end
it 'finds the application and calls CheckIngressIpAddressService#execute' do it 'finds the application and calls CheckIngressIpAddressService#execute' do
worker.perform('ingress', 117, 2) worker.perform('ingress', 117)
expect(service).to have_received(:execute) expect(service).to have_received(:execute)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment