Remove obsolete database config options

smokris · smokris · commit 516c690d87cd · 2022-08-09T13:57:04.000-04:00
diff --git a/README.md b/README.md
@@ -518,31 +518,13 @@ This controls how often (in minutes) to compact the database. The compaction
 process reclaims space and deletes unnecessary rows. If not supplied, the
 default is every 60 minutes. This option is supported in PuppetDB >= 0.9.
 
-#### `log_slow_statements`
-
-This sets the number of seconds before an SQL query is considered "slow." Slow
-SQL queries are logged as warnings, to assist in debugging and tuning. Note
-PuppetDB does not interrupt slow queries; it simply reports them after they
-complete.
-
-The default value is `10` seconds. A value of 0 will disable logging of slow
-queries. This option is supported in PuppetDB >= 1.1.
-
 #### `conn_max_age`
 
 The maximum time (in minutes) for a pooled connection to remain unused before
 it is closed off.
 
 If not supplied, we default to `60` minutes. This option is supported in PuppetDB >= 1.1.
 
-#### `conn_keep_alive`
-
-This sets the time (in minutes) for a connection to remain idle before sending
-a test query to the DB. This is useful to prevent a DB from timing out
-connections on its end.
-
-If not supplied, we default to 45 minutes. This option is supported in PuppetDB >= 1.1.
-
 #### `conn_lifetime`
 
 The maximum time (in minutes) a pooled connection should remain open. Any
@@ -640,31 +622,13 @@ The name of the read database instance to connect to. If `read_database_host`
 is set to `undef`, and `manage_database` is set to `true`, it will use the value of
 the `database_name` parameter. This option is supported in PuppetDB >= 1.6.
 
-#### `read_log_slow_statements`
-
-This sets the number of seconds before an SQL query to the read database is
-considered "slow." Slow SQL queries are logged as warnings, to assist in
-debugging and tuning. Note PuppetDB does not interrupt slow queries; it simply
-reports them after they complete.
-
-The default value is 10 seconds. A value of 0 will disable logging of slow
-queries. This option is supported in PuppetDB >= 1.6.
-
 #### `read_conn_max_age`
 
 The maximum time (in minutes) for a pooled read database connection to remain
 unused before it is closed off.
 
 If not supplied, we default to 60 minutes. This option is supported in PuppetDB >= 1.6.
 
-#### `read_conn_keep_alive`
-
-This sets the time (in minutes) for a read database connection to remain idle
-before sending a test query to the DB. This is useful to prevent a DB from
-timing out connections on its end.
-
-If not supplied, we default to 45 minutes. This option is supported in PuppetDB >= 1.6.
-
 #### `read_conn_lifetime`
 
 The maximum time (in minutes) a pooled read database connection should remain
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -48,9 +48,7 @@
   Optional[Array] $facts_blacklist         = $puppetdb::params::facts_blacklist,
   $gc_interval                             = $puppetdb::params::gc_interval,
   $node_purge_gc_batch_limit               = $puppetdb::params::node_purge_gc_batch_limit,
-  $log_slow_statements                     = $puppetdb::params::log_slow_statements,
   $conn_max_age                            = $puppetdb::params::conn_max_age,
-  $conn_keep_alive                         = $puppetdb::params::conn_keep_alive,
   $conn_lifetime                           = $puppetdb::params::conn_lifetime,
   $puppetdb_package                        = $puppetdb::params::puppetdb_package,
   $puppetdb_service                        = $puppetdb::params::puppetdb_service,
@@ -67,9 +65,7 @@
   $manage_read_db_password                 = $puppetdb::params::manage_read_db_password,
   $read_database_jdbc_ssl_properties       = $puppetdb::params::read_database_jdbc_ssl_properties,
   $read_database_validate                  = $puppetdb::params::read_database_validate,
-  $read_log_slow_statements                = $puppetdb::params::read_log_slow_statements,
   $read_conn_max_age                       = $puppetdb::params::read_conn_max_age,
-  $read_conn_keep_alive                    = $puppetdb::params::read_conn_keep_alive,
   $read_conn_lifetime                      = $puppetdb::params::read_conn_lifetime,
   $confdir                                 = $puppetdb::params::confdir,
   $vardir                                  = $puppetdb::params::vardir,
@@ -131,9 +127,7 @@
     facts_blacklist                   => $facts_blacklist,
     gc_interval                       => $gc_interval,
     node_purge_gc_batch_limit         => $node_purge_gc_batch_limit,
-    log_slow_statements               => $log_slow_statements,
     conn_max_age                      => $conn_max_age,
-    conn_keep_alive                   => $conn_keep_alive,
     conn_lifetime                     => $conn_lifetime,
     puppetdb_package                  => $puppetdb_package,
     puppetdb_service                  => $puppetdb_service,
@@ -152,9 +146,7 @@
     manage_read_db_password           => $manage_read_db_password,
     read_database_jdbc_ssl_properties => $read_database_jdbc_ssl_properties,
     read_database_validate            => $read_database_validate,
-    read_log_slow_statements          => $read_log_slow_statements,
     read_conn_max_age                 => $read_conn_max_age,
-    read_conn_keep_alive              => $read_conn_keep_alive,
     read_conn_lifetime                => $read_conn_lifetime,
     puppetdb_user                     => $puppetdb_user,
     puppetdb_group                    => $puppetdb_group,
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -53,9 +53,7 @@
   $gc_interval               = '60'
   $node_purge_gc_batch_limit = '25'
 
-  $log_slow_statements    = '10'
   $conn_max_age           = '60'
-  $conn_keep_alive        = '45'
   $conn_lifetime          = '0'
 
   $max_threads            = undef
@@ -71,9 +69,7 @@
   $manage_read_db_password           = true
   $read_database_jdbc_ssl_properties = ''
   $read_database_validate            = true
-  $read_log_slow_statements          = '10'
   $read_conn_max_age                 = '60'
-  $read_conn_keep_alive              = '45'
   $read_conn_lifetime                = '0'
   $read_database_max_pool_size       = undef
 
diff --git a/manifests/server.pp b/manifests/server.pp
@@ -38,9 +38,7 @@
   Optional[Array] $facts_blacklist         = $puppetdb::params::facts_blacklist,
   $gc_interval                             = $puppetdb::params::gc_interval,
   $node_purge_gc_batch_limit               = $puppetdb::params::node_purge_gc_batch_limit,
-  $log_slow_statements                     = $puppetdb::params::log_slow_statements,
   $conn_max_age                            = $puppetdb::params::conn_max_age,
-  $conn_keep_alive                         = $puppetdb::params::conn_keep_alive,
   $conn_lifetime                           = $puppetdb::params::conn_lifetime,
   $puppetdb_package                        = $puppetdb::params::puppetdb_package,
   $puppetdb_service                        = $puppetdb::params::puppetdb_service,
@@ -56,9 +54,7 @@
   $manage_read_db_password                 = $puppetdb::params::manage_read_db_password,
   $read_database_jdbc_ssl_properties       = $puppetdb::params::read_database_jdbc_ssl_properties,
   $read_database_validate                  = $puppetdb::params::read_database_validate,
-  $read_log_slow_statements                = $puppetdb::params::read_log_slow_statements,
   $read_conn_max_age                       = $puppetdb::params::read_conn_max_age,
-  $read_conn_keep_alive                    = $puppetdb::params::read_conn_keep_alive,
   $read_conn_lifetime                      = $puppetdb::params::read_conn_lifetime,
   $confdir                                 = $puppetdb::params::confdir,
   $vardir                                  = $puppetdb::params::vardir,
@@ -185,9 +181,7 @@
     facts_blacklist           => $facts_blacklist,
     gc_interval               => $gc_interval,
     node_purge_gc_batch_limit => $node_purge_gc_batch_limit,
-    log_slow_statements       => $log_slow_statements,
     conn_max_age              => $conn_max_age,
-    conn_keep_alive           => $conn_keep_alive,
     conn_lifetime             => $conn_lifetime,
     confdir                   => $confdir,
     puppetdb_user             => $puppetdb_user,
@@ -220,9 +214,7 @@
     ssl_ca_cert_path       => $ssl_ca_cert_path,
     jdbc_ssl_properties    => $read_database_jdbc_ssl_properties,
     database_validate      => $read_database_validate,
-    log_slow_statements    => $read_log_slow_statements,
     conn_max_age           => $read_conn_max_age,
-    conn_keep_alive        => $read_conn_keep_alive,
     conn_lifetime          => $read_conn_lifetime,
     confdir                => $confdir,
     puppetdb_user          => $puppetdb_user,
diff --git a/manifests/server/database.pp b/manifests/server/database.pp
@@ -16,9 +16,7 @@
   $facts_blacklist           = $puppetdb::params::facts_blacklist,
   $gc_interval               = $puppetdb::params::gc_interval,
   $node_purge_gc_batch_limit = $puppetdb::params::node_purge_gc_batch_limit,
-  $log_slow_statements       = $puppetdb::params::log_slow_statements,
   $conn_max_age              = $puppetdb::params::conn_max_age,
-  $conn_keep_alive           = $puppetdb::params::conn_keep_alive,
   $conn_lifetime             = $puppetdb::params::conn_lifetime,
   $confdir                   = $puppetdb::params::confdir,
   $puppetdb_user             = $puppetdb::params::puppetdb_user,
@@ -73,15 +71,8 @@
   }
 
   if $database == 'embedded' {
-
-    $classname = 'org.hsqldb.jdbcDriver'
-    $subprotocol = 'hsqldb'
     $subname = "file:${database_embedded_path};hsqldb.tx=mvcc;sql.syntax_pgs=true"
-
   } elsif $database == 'postgres' {
-    $classname = 'org.postgresql.Driver'
-    $subprotocol = 'postgresql'
-
     if !empty($jdbc_ssl_properties) {
       $database_suffix = $jdbc_ssl_properties
     }
@@ -121,16 +112,6 @@
     }
   }
 
-  ini_setting { 'puppetdb_classname':
-    setting => 'classname',
-    value   => $classname,
-  }
-
-  ini_setting { 'puppetdb_subprotocol':
-    setting => 'subprotocol',
-    value   => $subprotocol,
-  }
-
   ini_setting { 'puppetdb_pgs':
     setting => 'syntax_pgs',
     value   => true,
@@ -166,21 +147,11 @@
     value   => $report_ttl,
   }
 
-  ini_setting { 'puppetdb_log_slow_statements':
-    setting => 'log-slow-statements',
-    value   => $log_slow_statements,
-  }
-
   ini_setting { 'puppetdb_conn_max_age':
     setting => 'conn-max-age',
     value   => $conn_max_age,
   }
 
-  ini_setting { 'puppetdb_conn_keep_alive':
-    setting => 'conn-keep-alive',
-    value   => $conn_keep_alive,
-  }
-
   ini_setting { 'puppetdb_conn_lifetime':
     setting => 'conn-lifetime',
     value   => $conn_lifetime,
diff --git a/manifests/server/read_database.pp b/manifests/server/read_database.pp
@@ -9,9 +9,7 @@
   $manage_db_password     = $puppetdb::params::manage_read_db_password,
   $jdbc_ssl_properties    = $puppetdb::params::read_database_jdbc_ssl_properties,
   $database_validate      = $puppetdb::params::read_database_validate,
-  $log_slow_statements    = $puppetdb::params::read_log_slow_statements,
   $conn_max_age           = $puppetdb::params::read_conn_max_age,
-  $conn_keep_alive        = $puppetdb::params::read_conn_keep_alive,
   $conn_lifetime          = $puppetdb::params::read_conn_lifetime,
   $confdir                = $puppetdb::params::confdir,
   $puppetdb_user          = $puppetdb::params::puppetdb_user,
@@ -66,9 +64,6 @@
     }
 
     if $read_database == 'postgres' {
-      $classname = 'org.postgresql.Driver'
-      $subprotocol = 'postgresql'
-
       if !empty($jdbc_ssl_properties) {
         $database_suffix = $jdbc_ssl_properties
       }
@@ -107,16 +102,6 @@
       }
     }
 
-    ini_setting { 'puppetdb_read_classname':
-      setting => 'classname',
-      value   => $classname,
-    }
-
-    ini_setting { 'puppetdb_read_subprotocol':
-      setting => 'subprotocol',
-      value   => $subprotocol,
-    }
-
     ini_setting { 'puppetdb_read_pgs':
       setting => 'syntax_pgs',
       value   => true,
@@ -127,21 +112,11 @@
       value   => $subname,
     }
 
-    ini_setting { 'puppetdb_read_log_slow_statements':
-      setting => 'log-slow-statements',
-      value   => $log_slow_statements,
-    }
-
     ini_setting { 'puppetdb_read_conn_max_age':
       setting => 'conn-max-age',
       value   => $conn_max_age,
     }
 
-    ini_setting { 'puppetdb_read_conn_keep_alive':
-      setting => 'conn-keep-alive',
-      value   => $conn_keep_alive,
-    }
-
     ini_setting { 'puppetdb_read_conn_lifetime':
       setting => 'conn-lifetime',
       value   => $conn_lifetime,
diff --git a/spec/unit/classes/server/database_ini_spec.rb b/spec/unit/classes/server/database_ini_spec.rb
diff --git a/spec/unit/classes/server/read_database_ini_spec.rb b/spec/unit/classes/server/read_database_ini_spec.rb
