From 40a73b8c5cb3ae623ca400504302979b361a114a Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Tue, 29 Mar 2016 20:09:05 +0300 Subject: [PATCH] rename stack_syncronizer into stack_creation_waiter --- devops-service/messages/en.yml | 2 +- .../stack_bootstrap/stack_synchronizer_spec.rb | 4 ++-- .../spec/workers/stack_bootstrap_worker_spec.rb | 12 ++++++------ ...tack_synchronizer.rb => stack_creation_waiter.rb} | 4 ++-- devops-service/workers/stack_bootstrap_worker.rb | 12 ++++++------ 5 files changed, 17 insertions(+), 17 deletions(-) rename devops-service/workers/stack_bootstrap/{stack_synchronizer.rb => stack_creation_waiter.rb} (95%) diff --git a/devops-service/messages/en.yml b/devops-service/messages/en.yml index df4ad56..240fe95 100644 --- a/devops-service/messages/en.yml +++ b/devops-service/messages/en.yml @@ -19,7 +19,7 @@ en: timeout_reached: "Waiting for bootstrapping '%{server_id}' (job %{job_id}) halted: timeout reached." bootstrap_error: "Server '%{server_id}' bootstrapping failed (job %{job_id})." deploy_error: "Server '%{server_id}' deploy failed (job %{job_id})." - stack_synchronizer: + stack_creation_waiter: result: ok: "Stack '%{stack_id}' status is now %{status}" stack_rolled_back: "Stack '%{stack_id}' status is now %{status}" diff --git a/devops-service/spec/workers/stack_bootstrap/stack_synchronizer_spec.rb b/devops-service/spec/workers/stack_bootstrap/stack_synchronizer_spec.rb index 9d5a305..e7c5497 100644 --- a/devops-service/spec/workers/stack_bootstrap/stack_synchronizer_spec.rb +++ b/devops-service/spec/workers/stack_bootstrap/stack_synchronizer_spec.rb @@ -1,5 +1,5 @@ -require 'workers/stack_bootstrap/stack_synchronizer' -RSpec.describe StackSynchronizer, stubbed_connector: true, init_messages: true do +require 'workers/stack_bootstrap/stack_creation_waiter' +RSpec.describe StackCreationWaiter, stubbed_connector: true, init_messages: true do let(:out) { double(:out, puts: nil, flush: nil) } let(:stack) { build(:stack) } let(:syncer) { described_class.new(stack, out) } diff --git a/devops-service/spec/workers/stack_bootstrap_worker_spec.rb b/devops-service/spec/workers/stack_bootstrap_worker_spec.rb index df37965..58ed21e 100644 --- a/devops-service/spec/workers/stack_bootstrap_worker_spec.rb +++ b/devops-service/spec/workers/stack_bootstrap_worker_spec.rb @@ -10,7 +10,7 @@ RSpec.describe StackBootstrapWorker, type: :worker, stubbed_connector: true, ini allow(Provider::ProviderFactory).to receive(:providers).and_return(%w(ec2)) 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(: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 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(:bootstrap_servers_by_priority).and_call_original allow(StackServersPersister).to receive(:new) { @@ -102,16 +102,16 @@ RSpec.describe StackBootstrapWorker, type: :worker, stubbed_connector: true, ini end it "return 0 if syncer returns ok" do - allow(StackSynchronizer).to receive(:new) { - instance_double(StackSynchronizer, sync: StackSynchronizer::SyncResult.new(0)) + allow(StackCreationWaiter).to receive(:new) { + instance_double(StackCreationWaiter, sync: StackCreationWaiter::SyncResult.new(0)) } expect(StackServersPersister).to receive(:new).with(instance_of(Devops::Model::StackEc2), anything) expect(perform_with_bootstrap).to eq 0 end it 'returns 1 if syncer returns error' do - allow(StackSynchronizer).to receive(:new) { - instance_double(StackSynchronizer, sync: StackSynchronizer::SyncResult.new(5)) + allow(StackCreationWaiter).to receive(:new) { + instance_double(StackCreationWaiter, sync: StackCreationWaiter::SyncResult.new(5)) } expect(perform_with_bootstrap).to eq 1 end diff --git a/devops-service/workers/stack_bootstrap/stack_synchronizer.rb b/devops-service/workers/stack_bootstrap/stack_creation_waiter.rb similarity index 95% rename from devops-service/workers/stack_bootstrap/stack_synchronizer.rb rename to devops-service/workers/stack_bootstrap/stack_creation_waiter.rb index d036ec1..1cc9a53 100644 --- a/devops-service/workers/stack_bootstrap/stack_synchronizer.rb +++ b/devops-service/workers/stack_bootstrap/stack_creation_waiter.rb @@ -1,5 +1,5 @@ # Polling stack status until it's completed or failed. -class StackSynchronizer +class StackCreationWaiter include PutsAndFlush attr_reader :out, :stack @@ -74,7 +74,7 @@ class StackSynchronizer end 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(&:+)) end diff --git a/devops-service/workers/stack_bootstrap_worker.rb b/devops-service/workers/stack_bootstrap_worker.rb index c94c00f..bbbc03e 100644 --- a/devops-service/workers/stack_bootstrap_worker.rb +++ b/devops-service/workers/stack_bootstrap_worker.rb @@ -1,6 +1,6 @@ require "db/mongo/models/stack/stack_factory" 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/stack_servers_persister" @@ -17,7 +17,7 @@ class StackBootstrapWorker < Worker save_report(stack_attrs) @stack = create_stack(stack_attrs) - if !sync_stack + if !wait_till_stack_is_created puts_and_flush "Stack creating error" return 1 end @@ -54,14 +54,14 @@ class StackBootstrapWorker < Worker mongo.stack_insert(stack) end - def sync_stack - sync_result = StackSynchronizer.new(@stack, out).sync + def wait_till_stack_is_created + wait_result = StackCreationWaiter.new(@stack, out).sync - if sync_result.ok? + if wait_result.ok? puts_and_flush "\nStack '#{@stack.name}' has been created" true 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 end end