From b7a9b57c3437ac0a86a9ea3f2be3f574a1c0be3c Mon Sep 17 00:00:00 2001
From: Florian Braun <5863788+FloThinksPi@users.noreply.github.com>
Date: Wed, 21 Feb 2024 10:01:20 +0100
Subject: [PATCH] Add max_migration_statement_runtime_in_seconds into default
 config

For consitency since other optional parameters are also
defined there explicitly.
---
 config/cloud_controller.yml                                      | 1 +
 lib/cloud_controller/config_schemas/base/clock_schema.rb         | 1 -
 .../config_schemas/base/deployment_updater_schema.rb             | 1 -
 lib/cloud_controller/config_schemas/base/worker_schema.rb        | 1 -
 .../config_schemas/vms/rotate_database_key_schema.rb             | 1 -
 lib/cloud_controller/config_schemas/vms/route_syncer_schema.rb   | 1 -
 6 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/config/cloud_controller.yml b/config/cloud_controller.yml
index 27c7cdb0215..53c011542be 100644
--- a/config/cloud_controller.yml
+++ b/config/cloud_controller.yml
@@ -322,6 +322,7 @@ newrelic_enabled: false
 max_annotations_per_resource: 200
 max_labels_per_resource: 50
 max_migration_duration_in_minutes: 45
+max_migration_statement_runtime_in_seconds: 30
 db:
   log_level: 'debug'
   ssl_verify_hostname: false
diff --git a/lib/cloud_controller/config_schemas/base/clock_schema.rb b/lib/cloud_controller/config_schemas/base/clock_schema.rb
index 30954c7d859..6ebca280fa5 100644
--- a/lib/cloud_controller/config_schemas/base/clock_schema.rb
+++ b/lib/cloud_controller/config_schemas/base/clock_schema.rb
@@ -48,7 +48,6 @@ class ClockSchema < VCAP::Config
             newrelic_enabled: bool,
 
             optional(:max_migration_duration_in_minutes) => Integer,
-            optional(:max_migration_statement_runtime_in_seconds) => Integer,
             db: {
               optional(:database) => Hash, # db connection hash for sequel
               max_connections: Integer, # max connections in the connection pool
diff --git a/lib/cloud_controller/config_schemas/base/deployment_updater_schema.rb b/lib/cloud_controller/config_schemas/base/deployment_updater_schema.rb
index 5e76a5eae8e..d7b3f099b5b 100644
--- a/lib/cloud_controller/config_schemas/base/deployment_updater_schema.rb
+++ b/lib/cloud_controller/config_schemas/base/deployment_updater_schema.rb
@@ -19,7 +19,6 @@ class DeploymentUpdaterSchema < VCAP::Config
               deployment_updater: Integer
             },
             optional(:max_migration_duration_in_minutes) => Integer,
-            optional(:max_migration_statement_runtime_in_seconds) => Integer,
             db: {
               optional(:database) => Hash, # db connection hash for sequel
               max_connections: Integer, # max connections in the connection pool
diff --git a/lib/cloud_controller/config_schemas/base/worker_schema.rb b/lib/cloud_controller/config_schemas/base/worker_schema.rb
index 02c27b9ad66..77b9c502e9a 100644
--- a/lib/cloud_controller/config_schemas/base/worker_schema.rb
+++ b/lib/cloud_controller/config_schemas/base/worker_schema.rb
@@ -39,7 +39,6 @@ class WorkerSchema < VCAP::Config
             newrelic_enabled: bool,
 
             optional(:max_migration_duration_in_minutes) => Integer,
-            optional(:max_migration_statement_runtime_in_seconds) => Integer,
             db: {
               optional(:database) => Hash, # db connection hash for sequel
               max_connections: Integer, # max connections in the connection pool
diff --git a/lib/cloud_controller/config_schemas/vms/rotate_database_key_schema.rb b/lib/cloud_controller/config_schemas/vms/rotate_database_key_schema.rb
index d8669512700..7a41b53f672 100644
--- a/lib/cloud_controller/config_schemas/vms/rotate_database_key_schema.rb
+++ b/lib/cloud_controller/config_schemas/vms/rotate_database_key_schema.rb
@@ -16,7 +16,6 @@ class RotateDatabaseKeySchema < VCAP::Config
             pid_filename: String, # Pid filename to use
 
             optional(:max_migration_duration_in_minutes) => Integer,
-            optional(:max_migration_statement_runtime_in_seconds) => Integer,
             db: {
               optional(:database) => Hash, # db connection hash for sequel\
               max_connections: Integer, # max connections in the connection pool
diff --git a/lib/cloud_controller/config_schemas/vms/route_syncer_schema.rb b/lib/cloud_controller/config_schemas/vms/route_syncer_schema.rb
index 4842dd16ad2..b389ea372f3 100644
--- a/lib/cloud_controller/config_schemas/vms/route_syncer_schema.rb
+++ b/lib/cloud_controller/config_schemas/vms/route_syncer_schema.rb
@@ -15,7 +15,6 @@ class RouteSyncerSchema < VCAP::Config
             pid_filename: String, # Pid filename to use
 
             optional(:max_migration_duration_in_minutes) => Integer,
-            optional(:max_migration_statement_runtime_in_seconds) => Integer,
             db: {
               optional(:database) => Hash, # db connection hash for sequel
               max_connections: Integer, # max connections in the connection pool