Add max_migration_statement_runtime_in_seconds into default config

For consitency since other optional parameters are also defined there explicitly.
cloudfoundry · Feb 21, 2024 · b7a9b57 · b7a9b57
1 parent d3885b6
commit b7a9b57
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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