Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions jobs/cloud_controller_ng/spec
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,14 @@ properties:
description: "Enable V2 endpoints"
default: false

cc.temporary_enable_async_recursive_delete.apps:
description: "Enable experimental async recursive delete for apps. Disabled by default."
default: false

cc.temporary_enable_async_recursive_delete.service_instances:
description: "Enable experimental async recursive delete for service instances. Disabled by default."
default: false

cc.directories.tmpdir:
default: "/var/vcap/data/cloud_controller_ng/tmp"
description: "The directory to use for temporary files"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,10 @@ rate_limiter_v2_api:

temporary_enable_v2: <%= p("cc.temporary_enable_v2") %>

temporary_enable_async_recursive_delete:
apps: <%= p("cc.temporary_enable_async_recursive_delete.apps") %>
service_instances: <%= p("cc.temporary_enable_async_recursive_delete.service_instances") %>

redis:
socket: "/var/vcap/data/valkey/valkey.sock"

Expand Down
23 changes: 23 additions & 0 deletions spec/cloud_controller_ng/cloud_controller_ng_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,29 @@ module Test
end
end

describe 'enable async recursive delete' do
it 'is by default false for apps and service instances' do
template_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links))
expect(template_hash['temporary_enable_async_recursive_delete']['apps']).to be(false)
expect(template_hash['temporary_enable_async_recursive_delete']['service_instances']).to be(false)
end

context 'when explicitly enabled for apps and service instances' do
before do
merged_manifest_properties['cc']['temporary_enable_async_recursive_delete'] = {
'apps' => true,
'service_instances' => true
}
end

it 'is true for apps and service instances' do
template_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links))
expect(template_hash['temporary_enable_async_recursive_delete']['apps']).to be(true)
expect(template_hash['temporary_enable_async_recursive_delete']['service_instances']).to be(true)
end
end
end

context 'when db connection expiration configuration is present' do
before do
merged_manifest_properties['ccdb']['connection_expiration_timeout'] = 3600
Expand Down