From 965f6ce22c09bb1d98353a2d1a7e3b319431fb60 Mon Sep 17 00:00:00 2001 From: Philipp Thun Date: Fri, 20 Nov 2026 15:09:53 +0100 Subject: [PATCH] Avoid one_to_one setter when creating lifecycle data The Sequel one_to_one setter issues a no-op un-link UPDATE that deadlocks on MySQL under concurrent app/build/droplet creates. The child is already linked via .create(parent:), so assign nothing and let the association load lazily. Some specs relied on that un-link UPDATE to clear a second lifecycle data row the factory had already created. Add a :no_lifecycle_data trait so the factory skips that row, instead of depending on the setter to remove it. --- app/actions/droplet_create.rb | 2 +- .../diego/lifecycles/app_buildpack_lifecycle.rb | 2 +- lib/cloud_controller/diego/lifecycles/app_cnb_lifecycle.rb | 2 +- .../diego/lifecycles/buildpack_lifecycle.rb | 2 +- lib/cloud_controller/diego/lifecycles/cnb_lifecycle.rb | 2 +- spec/request/apps_spec.rb | 2 ++ spec/request/builds_spec.rb | 3 +++ spec/support/factory_definitions/app_model.rb | 7 +++++++ spec/support/factory_definitions/build_model.rb | 7 +++++++ .../diego/lifecycles/app_buildpack_lifecycle_spec.rb | 4 ++-- .../diego/lifecycles/app_cnb_lifecycle_spec.rb | 2 +- 11 files changed, 27 insertions(+), 8 deletions(-) diff --git a/app/actions/droplet_create.rb b/app/actions/droplet_create.rb index 7bfb4ce5e7b..37ec1ffc1dd 100644 --- a/app/actions/droplet_create.rb +++ b/app/actions/droplet_create.rb @@ -21,7 +21,7 @@ def create(app, message, user_audit_info) DropletModel.db.transaction do droplet.save - droplet.buildpack_lifecycle_data = VCAP::CloudController::BuildpackLifecycleDataModel.create( + VCAP::CloudController::BuildpackLifecycleDataModel.create( droplet: ) end diff --git a/lib/cloud_controller/diego/lifecycles/app_buildpack_lifecycle.rb b/lib/cloud_controller/diego/lifecycles/app_buildpack_lifecycle.rb index 4cd343dca96..636e03a7a84 100644 --- a/lib/cloud_controller/diego/lifecycles/app_buildpack_lifecycle.rb +++ b/lib/cloud_controller/diego/lifecycles/app_buildpack_lifecycle.rb @@ -3,7 +3,7 @@ module VCAP::CloudController class AppBuildpackLifecycle < AppBaseLifecycle def create_lifecycle_data_model(app) - app.buildpack_lifecycle_data = BuildpackLifecycleDataModel.create( + BuildpackLifecycleDataModel.create( buildpacks: buildpacks, stack: stack, credentials: message.buildpack_data.credentials, diff --git a/lib/cloud_controller/diego/lifecycles/app_cnb_lifecycle.rb b/lib/cloud_controller/diego/lifecycles/app_cnb_lifecycle.rb index 9618f91979b..7929e8af567 100644 --- a/lib/cloud_controller/diego/lifecycles/app_cnb_lifecycle.rb +++ b/lib/cloud_controller/diego/lifecycles/app_cnb_lifecycle.rb @@ -4,7 +4,7 @@ module VCAP::CloudController class AppCNBLifecycle < AppBaseLifecycle def create_lifecycle_data_model(app) - app.cnb_lifecycle_data = CNBLifecycleDataModel.create( + CNBLifecycleDataModel.create( buildpacks: buildpacks, stack: stack, credentials: message.buildpack_data.credentials, diff --git a/lib/cloud_controller/diego/lifecycles/buildpack_lifecycle.rb b/lib/cloud_controller/diego/lifecycles/buildpack_lifecycle.rb index c46644114ec..f93dafa6a6c 100644 --- a/lib/cloud_controller/diego/lifecycles/buildpack_lifecycle.rb +++ b/lib/cloud_controller/diego/lifecycles/buildpack_lifecycle.rb @@ -10,7 +10,7 @@ def type end def create_lifecycle_data_model(build) - build.buildpack_lifecycle_data = VCAP::CloudController::BuildpackLifecycleDataModel.create( + VCAP::CloudController::BuildpackLifecycleDataModel.create( buildpacks: Array(buildpacks_to_use), stack: staging_stack, build: build diff --git a/lib/cloud_controller/diego/lifecycles/cnb_lifecycle.rb b/lib/cloud_controller/diego/lifecycles/cnb_lifecycle.rb index a82c202ec39..91abc145152 100644 --- a/lib/cloud_controller/diego/lifecycles/cnb_lifecycle.rb +++ b/lib/cloud_controller/diego/lifecycles/cnb_lifecycle.rb @@ -10,7 +10,7 @@ def type end def create_lifecycle_data_model(build) - build.cnb_lifecycle_data = VCAP::CloudController::CNBLifecycleDataModel.create( + VCAP::CloudController::CNBLifecycleDataModel.create( buildpacks: Array(buildpacks_to_use), stack: staging_stack, build: build, diff --git a/spec/request/apps_spec.rb b/spec/request/apps_spec.rb index 1fb50217fc8..79b094b6a69 100644 --- a/spec/request/apps_spec.rb +++ b/spec/request/apps_spec.rb @@ -1881,6 +1881,7 @@ let(:app_model) { create(:app_model, space: space, name: 'my-app') } let(:build) do create(:build_model, + :no_lifecycle_data, package: package, app: app_model, staging_memory_in_mb: 123, @@ -1892,6 +1893,7 @@ end let!(:second_build) do create(:build_model, + :no_lifecycle_data, package: package, app: app_model, staging_memory_in_mb: 123, diff --git a/spec/request/builds_spec.rb b/spec/request/builds_spec.rb index 5e4106c7f67..cfe057152ae 100644 --- a/spec/request/builds_spec.rb +++ b/spec/request/builds_spec.rb @@ -373,6 +373,7 @@ describe 'GET /v3/builds' do let(:build) do create(:build_model, + :no_lifecycle_data, package: package, app: app_model, created_by_user_name: 'bob the builder', @@ -384,6 +385,7 @@ end let!(:second_build) do create(:build_model, + :no_lifecycle_data, package: second_package, app: app_model, created_at: build.created_at - 1.day, @@ -588,6 +590,7 @@ describe 'GET /v3/builds/:guid' do let(:build) do create(:build_model, + :no_lifecycle_data, package: package, app: app_model, staging_memory_in_mb: 123, diff --git a/spec/support/factory_definitions/app_model.rb b/spec/support/factory_definitions/app_model.rb index c1eafc9e5c4..eccbbe804c7 100644 --- a/spec/support/factory_definitions/app_model.rb +++ b/spec/support/factory_definitions/app_model.rb @@ -37,6 +37,13 @@ lifecycle { :cnb } end + # For specs that create the lifecycle data themselves (e.g. + # #create_lifecycle_data_model); avoids a colliding pre-existing row. + trait :no_lifecycle_data do + lifecycle_type { VCAP::CloudController::BuildpackLifecycleDataModel::LIFECYCLE_TYPE } + lifecycle { :none } + end + trait :all_fields do association :droplet, factory: :droplet_model buildpack_cache_sha256_checksum { generate(:guid) } diff --git a/spec/support/factory_definitions/build_model.rb b/spec/support/factory_definitions/build_model.rb index 45d8239aef5..abfe1292153 100644 --- a/spec/support/factory_definitions/build_model.rb +++ b/spec/support/factory_definitions/build_model.rb @@ -36,5 +36,12 @@ state { VCAP::CloudController::BuildModel::STAGING_STATE } association :app, factory: %i[app_model cnb] end + + # For specs that create the lifecycle data themselves (e.g. + # #create_lifecycle_data_model); avoids a colliding pre-existing row. + trait :no_lifecycle_data do + lifecycle_type { VCAP::CloudController::BuildpackLifecycleDataModel::LIFECYCLE_TYPE } + lifecycle { :none } + end end end diff --git a/spec/unit/lib/cloud_controller/diego/lifecycles/app_buildpack_lifecycle_spec.rb b/spec/unit/lib/cloud_controller/diego/lifecycles/app_buildpack_lifecycle_spec.rb index 21f83c5ee8a..ad068f388d8 100644 --- a/spec/unit/lib/cloud_controller/diego/lifecycles/app_buildpack_lifecycle_spec.rb +++ b/spec/unit/lib/cloud_controller/diego/lifecycles/app_buildpack_lifecycle_spec.rb @@ -13,7 +13,7 @@ module VCAP::CloudController it_behaves_like 'custom-stack lifecycle updates', 'buildpack', 'https://example.com/buildpack.zip' describe '#create_lifecycle_data_model' do - let!(:app) { create(:app_model) } + let!(:app) { create(:app_model, :no_lifecycle_data) } it 'creates BuildpackLifecycleDataModel' do expect do @@ -192,7 +192,7 @@ module VCAP::CloudController context 'when credentials are provided' do let(:creds) { { 'git.example.com' => { 'username' => 'u', 'password' => 'p' } } } let(:lifecycle_request_data) { { buildpacks: ['http://git.example.com/acme/bp.git'], credentials: creds } } - let!(:app) { create(:app_model) } + let!(:app) { create(:app_model, :no_lifecycle_data) } it 'stores credentials on the lifecycle data model' do lifecycle.create_lifecycle_data_model(app) diff --git a/spec/unit/lib/cloud_controller/diego/lifecycles/app_cnb_lifecycle_spec.rb b/spec/unit/lib/cloud_controller/diego/lifecycles/app_cnb_lifecycle_spec.rb index 19d8ddccce8..400bfccd90d 100644 --- a/spec/unit/lib/cloud_controller/diego/lifecycles/app_cnb_lifecycle_spec.rb +++ b/spec/unit/lib/cloud_controller/diego/lifecycles/app_cnb_lifecycle_spec.rb @@ -13,7 +13,7 @@ module VCAP::CloudController it_behaves_like 'custom-stack lifecycle updates', 'cnb', 'docker://registry.example.com/team/buildpack:latest' describe '#create_lifecycle_data_model' do - let!(:app) { create(:app_model) } + let!(:app) { create(:app_model, :no_lifecycle_data) } it 'creates CNBLifecycleDataModel' do expect do