rename stack_syncronizer into stack_creation_waiter

This commit is contained in:
Anton Chuchkalov 2016-03-29 20:09:05 +03:00
parent 80a0c8f436
commit 40a73b8c5c
5 changed files with 17 additions and 17 deletions

View File

@ -19,7 +19,7 @@ en:
timeout_reached: "Waiting for bootstrapping '%{server_id}' (job %{job_id}) halted: timeout reached." timeout_reached: "Waiting for bootstrapping '%{server_id}' (job %{job_id}) halted: timeout reached."
bootstrap_error: "Server '%{server_id}' bootstrapping failed (job %{job_id})." bootstrap_error: "Server '%{server_id}' bootstrapping failed (job %{job_id})."
deploy_error: "Server '%{server_id}' deploy failed (job %{job_id})." deploy_error: "Server '%{server_id}' deploy failed (job %{job_id})."
stack_synchronizer: stack_creation_waiter:
result: result:
ok: "Stack '%{stack_id}' status is now %{status}" ok: "Stack '%{stack_id}' status is now %{status}"
stack_rolled_back: "Stack '%{stack_id}' status is now %{status}" stack_rolled_back: "Stack '%{stack_id}' status is now %{status}"

View File

@ -1,5 +1,5 @@
require 'workers/stack_bootstrap/stack_synchronizer' require 'workers/stack_bootstrap/stack_creation_waiter'
RSpec.describe StackSynchronizer, stubbed_connector: true, init_messages: true do RSpec.describe StackCreationWaiter, stubbed_connector: true, init_messages: true do
let(:out) { double(:out, puts: nil, flush: nil) } let(:out) { double(:out, puts: nil, flush: nil) }
let(:stack) { build(:stack) } let(:stack) { build(:stack) }
let(:syncer) { described_class.new(stack, out) } let(:syncer) { described_class.new(stack, out) }

View File

@ -10,7 +10,7 @@ RSpec.describe StackBootstrapWorker, type: :worker, stubbed_connector: true, ini
allow(Provider::ProviderFactory).to receive(:providers).and_return(%w(ec2)) allow(Provider::ProviderFactory).to receive(:providers).and_return(%w(ec2))
allow(worker).to receive(:update_report) allow(worker).to receive(:update_report)
allow(worker).to receive(:sync_stack) { true } allow(worker).to receive(:wait_till_stack_is_created) { true }
allow(worker).to receive(:persist_stack_servers) { {1 => build_list(:server, 2)} } allow(worker).to receive(:persist_stack_servers) { {1 => build_list(:server, 2)} }
allow(worker).to receive(:bootstrap_servers_by_priority) { ServersBootstrapper::Result.new(0) } allow(worker).to receive(:bootstrap_servers_by_priority) { ServersBootstrapper::Result.new(0) }
@ -90,7 +90,7 @@ RSpec.describe StackBootstrapWorker, type: :worker, stubbed_connector: true, ini
context "without stubbing methods", stubbed_connector: true do context "without stubbing methods", stubbed_connector: true do
before do before do
allow(worker).to receive(:sync_stack).and_call_original allow(worker).to receive(:wait_till_stack_is_created).and_call_original
allow(worker).to receive(:persist_stack_servers).and_call_original allow(worker).to receive(:persist_stack_servers).and_call_original
allow(worker).to receive(:bootstrap_servers_by_priority).and_call_original allow(worker).to receive(:bootstrap_servers_by_priority).and_call_original
allow(StackServersPersister).to receive(:new) { allow(StackServersPersister).to receive(:new) {
@ -102,16 +102,16 @@ RSpec.describe StackBootstrapWorker, type: :worker, stubbed_connector: true, ini
end end
it "return 0 if syncer returns ok" do it "return 0 if syncer returns ok" do
allow(StackSynchronizer).to receive(:new) { allow(StackCreationWaiter).to receive(:new) {
instance_double(StackSynchronizer, sync: StackSynchronizer::SyncResult.new(0)) instance_double(StackCreationWaiter, sync: StackCreationWaiter::SyncResult.new(0))
} }
expect(StackServersPersister).to receive(:new).with(instance_of(Devops::Model::StackEc2), anything) expect(StackServersPersister).to receive(:new).with(instance_of(Devops::Model::StackEc2), anything)
expect(perform_with_bootstrap).to eq 0 expect(perform_with_bootstrap).to eq 0
end end
it 'returns 1 if syncer returns error' do it 'returns 1 if syncer returns error' do
allow(StackSynchronizer).to receive(:new) { allow(StackCreationWaiter).to receive(:new) {
instance_double(StackSynchronizer, sync: StackSynchronizer::SyncResult.new(5)) instance_double(StackCreationWaiter, sync: StackCreationWaiter::SyncResult.new(5))
} }
expect(perform_with_bootstrap).to eq 1 expect(perform_with_bootstrap).to eq 1
end end

View File

@ -1,5 +1,5 @@
# Polling stack status until it's completed or failed. # Polling stack status until it's completed or failed.
class StackSynchronizer class StackCreationWaiter
include PutsAndFlush include PutsAndFlush
attr_reader :out, :stack attr_reader :out, :stack
@ -74,7 +74,7 @@ class StackSynchronizer
end end
def print_result_message def print_result_message
puts_and_flush Devops::Messages.t("stack_synchronizer.result.#{@sync_result.reason}", puts_and_flush Devops::Messages.t("stack_creation_waiter.result.#{@sync_result.reason}",
stack_id: stack.id, status: stack.stack_status, seconds: sleep_times.inject(&:+)) stack_id: stack.id, status: stack.stack_status, seconds: sleep_times.inject(&:+))
end end

View File

@ -1,6 +1,6 @@
require "db/mongo/models/stack/stack_factory" require "db/mongo/models/stack/stack_factory"
require "db/mongo/models/project" require "db/mongo/models/project"
require "workers/stack_bootstrap/stack_synchronizer" require "workers/stack_bootstrap/stack_creation_waiter"
require "workers/stack_bootstrap/servers_bootstrapper" require "workers/stack_bootstrap/servers_bootstrapper"
require "workers/stack_bootstrap/stack_servers_persister" require "workers/stack_bootstrap/stack_servers_persister"
@ -17,7 +17,7 @@ class StackBootstrapWorker < Worker
save_report(stack_attrs) save_report(stack_attrs)
@stack = create_stack(stack_attrs) @stack = create_stack(stack_attrs)
if !sync_stack if !wait_till_stack_is_created
puts_and_flush "Stack creating error" puts_and_flush "Stack creating error"
return 1 return 1
end end
@ -54,14 +54,14 @@ class StackBootstrapWorker < Worker
mongo.stack_insert(stack) mongo.stack_insert(stack)
end end
def sync_stack def wait_till_stack_is_created
sync_result = StackSynchronizer.new(@stack, out).sync wait_result = StackCreationWaiter.new(@stack, out).sync
if sync_result.ok? if wait_result.ok?
puts_and_flush "\nStack '#{@stack.name}' has been created" puts_and_flush "\nStack '#{@stack.name}' has been created"
true true
else else
puts_and_flush "An error ocurred during stack synchronization: #{sync_result.reason}" puts_and_flush "An error ocurred during stack creation: #{wait_result.reason}"
false false
end end
end end