Spec for PeriodicUpdater.stop_updates

Author: jochenehret

lib/cloud_controller/metrics/periodic_updater.rb

@@ -17,15 +17,16 @@ def initialize(start_time, log_counter, logger, statsd_updater, prometheus_updat
     def setup_updates
       update!
       @update_tasks = []
-      @update_tasks << Concurrent::TimerTask.new(execution_interval: 600) { catch_error { update_user_count } }.execute
-      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_job_queue_length } }.execute
-      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_job_queue_load } }.execute
-      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_failed_job_count } }.execute
-      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_vitals } }.execute
-      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_log_counts } }.execute
-      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_task_stats } }.execute
-      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_deploying_count } }.execute
-      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_webserver_stats } }.execute
+      @update_tasks << Concurrent::TimerTask.new(execution_interval: 600) { catch_error { update_user_count } }
+      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_job_queue_length } }
+      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_job_queue_load } }
+      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_failed_job_count } }
+      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_vitals } }
+      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_log_counts } }
+      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_task_stats } }
+      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_deploying_count } }
+      @update_tasks << Concurrent::TimerTask.new(execution_interval: 30) { catch_error { update_webserver_stats } }
+      @update_tasks.each(&:execute)
     end
 
     def stop_updates

spec/unit/lib/cloud_controller/metrics/periodic_updater_spec.rb

@@ -183,6 +183,28 @@ module VCAP::CloudController::Metrics
           @periodic_timers[6][:block].call
         end
       end
+
+      context 'when PeriodicUpdater is shut down' do
+        it 'does nothing when updates have not been setup' do
+          expect { periodic_updater.stop_updates }.not_to raise_error
+        end
+
+        it 'shuts down all timer tasks after setup_updates' do
+          timer_doubles = []
+          allow(Concurrent::TimerTask).to receive(:new) do |*|
+            dbl = double('TimerTask', execute: nil, shutdown: nil)
+            timer_doubles << dbl
+            dbl
+          end
+
+          periodic_updater.setup_updates
+
+          expect(timer_doubles.size).to eq(9)
+          expect(timer_doubles).to all(receive(:shutdown).once)
+
+          periodic_updater.stop_updates
+        end
+      end
     end
 
     describe '#update_deploying_count' do