remove calculators

Author: sethboyles

lib/cloud_controller/deployment_updater/actions/canary.rb

@@ -1,5 +1,4 @@
 require 'cloud_controller/deployment_updater/actions/scale_down_canceled'
-require 'cloud_controller/deployment_updater/calculators/all_instances_routable'
 
 module VCAP::CloudController
   module DeploymentUpdater
@@ -16,7 +15,7 @@ def call
           deployment.db.transaction do
             deployment.lock!
             return unless deployment.state == DeploymentModel::PREPAUSED_STATE
-            return unless Calculators::AllInstancesRoutable.new(deployment, logger).call
+            return unless all_instances_routable?
 
             ScaleDownCanceled.new(deployment).call
 
@@ -29,6 +28,20 @@ def call
             logger.info("paused-canary-deployment-for-#{deployment.guid}")
           end
         end
+
+        private
+
+        def all_instances_routable?
+          instances = instance_reporters.all_instances_for_app(deployment.deploying_web_process)
+          instances.all? { |_, val| val[:state] == VCAP::CloudController::Diego::LRP_RUNNING && val[:routable] }
+        rescue CloudController::Errors::ApiError # the instances_reporter re-raises InstancesUnavailable as ApiError
+          logger.info("skipping-canary-update-for-#{deployment.guid}")
+          false
+        end
+
+        def instance_reporters
+          CloudController::DependencyLocator.instance.instances_reporters
+        end
       end
     end
   end

lib/cloud_controller/deployment_updater/actions/cancel.rb

@@ -1,4 +1,3 @@
-require 'cloud_controller/deployment_updater/calculators/find_interim_web_process'
 module VCAP::CloudController
   module DeploymentUpdater
     module Actions
@@ -19,7 +18,7 @@ def call
 
             deploying_web_process.lock!
 
-            prior_web_process = Calculators::FindInterimWebProcess.new(deployment).call || app.oldest_web_process
+            prior_web_process = find_interim_web_process || app.oldest_web_process
             prior_web_process.lock!
 
             prior_web_process.update(instances: deployment.original_web_process_instance_count)
@@ -33,6 +32,31 @@ def call
             )
           end
         end
+
+        private
+
+        def find_interim_web_process
+          # Find newest interim web process that (a) belongs to a SUPERSEDED (DEPLOYED) deployment and (b) has at least
+          # one running instance.
+          app.web_processes_dataset.
+            qualify.
+            join(:deployments, deploying_web_process_guid: :guid).
+            where(deployments__state: DeploymentModel::DEPLOYED_STATE).
+            where(deployments__status_reason: DeploymentModel::SUPERSEDED_STATUS_REASON).
+            order(Sequel.desc(:created_at), Sequel.desc(:id)).
+            find { |p| has_running_instance?(p) }
+        end
+
+        def has_running_instance?(process)
+          instances = instance_reporters.all_instances_for_app(process)
+          instances.any? { |_, val| val[:state] == VCAP::CloudController::Diego::LRP_RUNNING }
+        rescue CloudController::Errors::ApiError # the instances_reporter re-raises InstancesUnavailable as ApiError
+          false
+        end
+
+        def instance_reporters
+          CloudController::DependencyLocator.instance.instances_reporters
+        end
       end
     end
   end

lib/cloud_controller/deployment_updater/actions/scale.rb

@@ -1,7 +1,6 @@
 require 'cloud_controller/deployment_updater/actions/scale_down_canceled'
 require 'cloud_controller/deployment_updater/actions/scale_down_old_process'
 require 'cloud_controller/deployment_updater/actions/finalize'
-require 'cloud_controller/deployment_updater/calculators/all_instances_routable'
 
 module VCAP::CloudController
   module DeploymentUpdater
@@ -18,7 +17,7 @@ def initialize(deployment, logger)
         def call
           deployment.db.transaction do
             return unless deployment.lock!.state == DeploymentModel::DEPLOYING_STATE
-            return unless Calculators::AllInstancesRoutable.new(deployment, logger).call
+            return unless all_instances_routable?
 
             app.lock!
             oldest_web_process_with_instances.lock!
@@ -60,6 +59,18 @@ def oldest_web_process_with_instances
         def deploying_web_process
           @deploying_web_process ||= deployment.deploying_web_process
         end
+
+        def all_instances_routable?
+          instances = instance_reporters.all_instances_for_app(deployment.deploying_web_process)
+          instances.all? { |_, val| val[:state] == VCAP::CloudController::Diego::LRP_RUNNING && val[:routable] }
+        rescue CloudController::Errors::ApiError # the instances_reporter re-raises InstancesUnavailable as ApiError
+          logger.info("skipping-deployment-update-for-#{deployment.guid}")
+          false
+        end
+
+        def instance_reporters
+          CloudController::DependencyLocator.instance.instances_reporters
+        end
       end
     end
   end