Skip to content

Commit 25a4e40

Browse files
authored
Remove lifecycle_type_backfill job and related config (#5401)
1 parent 86c408c commit 25a4e40

7 files changed

Lines changed: 3 additions & 301 deletions

File tree

‎app/jobs/runtime/lifecycle_type_backfill.rb‎

Lines changed: 0 additions & 98 deletions
This file was deleted.

‎config/cloud_controller.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@ service_operations_delete_stuck_in_progress_retry:
6767
service_operations_binding_delete_stuck_in_progress_retry:
6868
frequency_in_seconds: 3600 #1h
6969

70-
# One-off backfill - to be removed in a future version.
71-
lifecycle_type_backfill:
72-
frequency_in_seconds: 3600 #1h
73-
7470
completed_tasks:
7571
cutoff_age_in_days: 31
7672

‎lib/cloud_controller/clock/scheduler.rb‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ class Scheduler
2828
{ name: 'service_operations_create_in_progress_cleanup', class: Jobs::Runtime::ServiceOperationsCreateInProgressCleanup },
2929
{ name: 'service_operations_update_stuck_in_progress_failed', class: Jobs::Runtime::ServiceOperationsUpdateStuckInProgressFailed },
3030
{ name: 'service_operations_delete_stuck_in_progress_retry', class: Jobs::Runtime::ServiceOperationsDeleteStuckInProgressRetry },
31-
{ name: 'service_operations_binding_delete_stuck_in_progress_retry', class: Jobs::Runtime::ServiceOperationsBindingDeleteStuckInProgressRetry },
32-
# One-off backfill - to be removed in a future version.
33-
{ name: 'lifecycle_type_backfill', class: Jobs::Runtime::LifecycleTypeBackfill }
31+
{ name: 'service_operations_binding_delete_stuck_in_progress_retry', class: Jobs::Runtime::ServiceOperationsBindingDeleteStuckInProgressRetry }
3432
].freeze
3533

3634
def self.queue_names

‎lib/cloud_controller/config_schemas/clock_schema.rb‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@ class ClockSchema < VCAP::Config
4646
service_operations_binding_delete_stuck_in_progress_retry: {
4747
frequency_in_seconds: Integer
4848
},
49-
# One-off backfill - to be removed in a future version.
50-
lifecycle_type_backfill: {
51-
frequency_in_seconds: Integer
52-
},
49+
5350
default_health_check_timeout: Integer,
5451

5552
uaa: {

‎lib/cloud_controller/jobs.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
require 'jobs/runtime/prune_completed_deployments'
4242
require 'jobs/runtime/prune_completed_builds'
4343
require 'jobs/runtime/prune_excess_app_revisions'
44-
require 'jobs/runtime/lifecycle_type_backfill'
4544

4645
require 'jobs/v2/services/service_usage_events_cleanup'
4746

‎spec/unit/jobs/runtime/lifecycle_type_backfill_spec.rb‎

Lines changed: 0 additions & 184 deletions
This file was deleted.

‎spec/unit/lib/cloud_controller/clock/scheduler_spec.rb‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module VCAP::CloudController
2525
service_operations_update_stuck_in_progress_failed: { frequency_in_seconds: 600 },
2626
service_operations_delete_stuck_in_progress_retry: { frequency_in_seconds: 600 },
2727
service_operations_binding_delete_stuck_in_progress_retry: { frequency_in_seconds: 600 },
28-
lifecycle_type_backfill: { frequency_in_seconds: 500 },
28+
2929
service_usage_events: { cutoff_age_in_days: 5 },
3030
completed_tasks: { cutoff_age_in_days: 6 },
3131
pending_droplets: { frequency_in_seconds: 300, expiration_in_seconds: 600 },
@@ -190,12 +190,6 @@ module VCAP::CloudController
190190
expect(block.call).to be_instance_of(Jobs::Runtime::ServiceOperationsBindingDeleteStuckInProgressRetry)
191191
end
192192

193-
expect(clock).to receive(:schedule_frequent_worker_job) do |args, &block|
194-
expect(args).to eql(name: 'lifecycle_type_backfill', interval: 500)
195-
expect(Jobs::Runtime::LifecycleTypeBackfill).to receive(:new).and_call_original
196-
expect(block.call).to be_instance_of(Jobs::Runtime::LifecycleTypeBackfill)
197-
end
198-
199193
schedule.start
200194
end
201195

0 commit comments

Comments
 (0)