Skip to content

Commit 516c690

Browse files
smokrissmokris
committed
Remove obsolete database config options
1 parent 68a140b commit 516c690

File tree

8 files changed

+0
-230
lines changed

8 files changed

+0
-230
lines changed

‎README.md

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -518,31 +518,13 @@ This controls how often (in minutes) to compact the database. The compaction
518518
process reclaims space and deletes unnecessary rows. If not supplied, the
519519
default is every 60 minutes. This option is supported in PuppetDB >= 0.9.
520520

521-
#### `log_slow_statements`
522-
523-
This sets the number of seconds before an SQL query is considered "slow." Slow
524-
SQL queries are logged as warnings, to assist in debugging and tuning. Note
525-
PuppetDB does not interrupt slow queries; it simply reports them after they
526-
complete.
527-
528-
The default value is `10` seconds. A value of 0 will disable logging of slow
529-
queries. This option is supported in PuppetDB >= 1.1.
530-
531521
#### `conn_max_age`
532522

533523
The maximum time (in minutes) for a pooled connection to remain unused before
534524
it is closed off.
535525

536526
If not supplied, we default to `60` minutes. This option is supported in PuppetDB >= 1.1.
537527

538-
#### `conn_keep_alive`
539-
540-
This sets the time (in minutes) for a connection to remain idle before sending
541-
a test query to the DB. This is useful to prevent a DB from timing out
542-
connections on its end.
543-
544-
If not supplied, we default to 45 minutes. This option is supported in PuppetDB >= 1.1.
545-
546528
#### `conn_lifetime`
547529

548530
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`
640622
is set to `undef`, and `manage_database` is set to `true`, it will use the value of
641623
the `database_name` parameter. This option is supported in PuppetDB >= 1.6.
642624

643-
#### `read_log_slow_statements`
644-
645-
This sets the number of seconds before an SQL query to the read database is
646-
considered "slow." Slow SQL queries are logged as warnings, to assist in
647-
debugging and tuning. Note PuppetDB does not interrupt slow queries; it simply
648-
reports them after they complete.
649-
650-
The default value is 10 seconds. A value of 0 will disable logging of slow
651-
queries. This option is supported in PuppetDB >= 1.6.
652-
653625
#### `read_conn_max_age`
654626

655627
The maximum time (in minutes) for a pooled read database connection to remain
656628
unused before it is closed off.
657629

658630
If not supplied, we default to 60 minutes. This option is supported in PuppetDB >= 1.6.
659631

660-
#### `read_conn_keep_alive`
661-
662-
This sets the time (in minutes) for a read database connection to remain idle
663-
before sending a test query to the DB. This is useful to prevent a DB from
664-
timing out connections on its end.
665-
666-
If not supplied, we default to 45 minutes. This option is supported in PuppetDB >= 1.6.
667-
668632
#### `read_conn_lifetime`
669633

670634
The maximum time (in minutes) a pooled read database connection should remain

‎manifests/init.pp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@
4848
Optional[Array] $facts_blacklist = $puppetdb::params::facts_blacklist,
4949
$gc_interval = $puppetdb::params::gc_interval,
5050
$node_purge_gc_batch_limit = $puppetdb::params::node_purge_gc_batch_limit,
51-
$log_slow_statements = $puppetdb::params::log_slow_statements,
5251
$conn_max_age = $puppetdb::params::conn_max_age,
53-
$conn_keep_alive = $puppetdb::params::conn_keep_alive,
5452
$conn_lifetime = $puppetdb::params::conn_lifetime,
5553
$puppetdb_package = $puppetdb::params::puppetdb_package,
5654
$puppetdb_service = $puppetdb::params::puppetdb_service,
@@ -67,9 +65,7 @@
6765
$manage_read_db_password = $puppetdb::params::manage_read_db_password,
6866
$read_database_jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,
6967
$read_database_validate = $puppetdb::params::read_database_validate,
70-
$read_log_slow_statements = $puppetdb::params::read_log_slow_statements,
7168
$read_conn_max_age = $puppetdb::params::read_conn_max_age,
72-
$read_conn_keep_alive = $puppetdb::params::read_conn_keep_alive,
7369
$read_conn_lifetime = $puppetdb::params::read_conn_lifetime,
7470
$confdir = $puppetdb::params::confdir,
7571
$vardir = $puppetdb::params::vardir,
@@ -131,9 +127,7 @@
131127
facts_blacklist => $facts_blacklist,
132128
gc_interval => $gc_interval,
133129
node_purge_gc_batch_limit => $node_purge_gc_batch_limit,
134-
log_slow_statements => $log_slow_statements,
135130
conn_max_age => $conn_max_age,
136-
conn_keep_alive => $conn_keep_alive,
137131
conn_lifetime => $conn_lifetime,
138132
puppetdb_package => $puppetdb_package,
139133
puppetdb_service => $puppetdb_service,
@@ -152,9 +146,7 @@
152146
manage_read_db_password => $manage_read_db_password,
153147
read_database_jdbc_ssl_properties => $read_database_jdbc_ssl_properties,
154148
read_database_validate => $read_database_validate,
155-
read_log_slow_statements => $read_log_slow_statements,
156149
read_conn_max_age => $read_conn_max_age,
157-
read_conn_keep_alive => $read_conn_keep_alive,
158150
read_conn_lifetime => $read_conn_lifetime,
159151
puppetdb_user => $puppetdb_user,
160152
puppetdb_group => $puppetdb_group,

‎manifests/params.pp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@
5353
$gc_interval = '60'
5454
$node_purge_gc_batch_limit = '25'
5555

56-
$log_slow_statements = '10'
5756
$conn_max_age = '60'
58-
$conn_keep_alive = '45'
5957
$conn_lifetime = '0'
6058

6159
$max_threads = undef
@@ -71,9 +69,7 @@
7169
$manage_read_db_password = true
7270
$read_database_jdbc_ssl_properties = ''
7371
$read_database_validate = true
74-
$read_log_slow_statements = '10'
7572
$read_conn_max_age = '60'
76-
$read_conn_keep_alive = '45'
7773
$read_conn_lifetime = '0'
7874
$read_database_max_pool_size = undef
7975

‎manifests/server.pp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@
3838
Optional[Array] $facts_blacklist = $puppetdb::params::facts_blacklist,
3939
$gc_interval = $puppetdb::params::gc_interval,
4040
$node_purge_gc_batch_limit = $puppetdb::params::node_purge_gc_batch_limit,
41-
$log_slow_statements = $puppetdb::params::log_slow_statements,
4241
$conn_max_age = $puppetdb::params::conn_max_age,
43-
$conn_keep_alive = $puppetdb::params::conn_keep_alive,
4442
$conn_lifetime = $puppetdb::params::conn_lifetime,
4543
$puppetdb_package = $puppetdb::params::puppetdb_package,
4644
$puppetdb_service = $puppetdb::params::puppetdb_service,
@@ -56,9 +54,7 @@
5654
$manage_read_db_password = $puppetdb::params::manage_read_db_password,
5755
$read_database_jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,
5856
$read_database_validate = $puppetdb::params::read_database_validate,
59-
$read_log_slow_statements = $puppetdb::params::read_log_slow_statements,
6057
$read_conn_max_age = $puppetdb::params::read_conn_max_age,
61-
$read_conn_keep_alive = $puppetdb::params::read_conn_keep_alive,
6258
$read_conn_lifetime = $puppetdb::params::read_conn_lifetime,
6359
$confdir = $puppetdb::params::confdir,
6460
$vardir = $puppetdb::params::vardir,
@@ -185,9 +181,7 @@
185181
facts_blacklist => $facts_blacklist,
186182
gc_interval => $gc_interval,
187183
node_purge_gc_batch_limit => $node_purge_gc_batch_limit,
188-
log_slow_statements => $log_slow_statements,
189184
conn_max_age => $conn_max_age,
190-
conn_keep_alive => $conn_keep_alive,
191185
conn_lifetime => $conn_lifetime,
192186
confdir => $confdir,
193187
puppetdb_user => $puppetdb_user,
@@ -220,9 +214,7 @@
220214
ssl_ca_cert_path => $ssl_ca_cert_path,
221215
jdbc_ssl_properties => $read_database_jdbc_ssl_properties,
222216
database_validate => $read_database_validate,
223-
log_slow_statements => $read_log_slow_statements,
224217
conn_max_age => $read_conn_max_age,
225-
conn_keep_alive => $read_conn_keep_alive,
226218
conn_lifetime => $read_conn_lifetime,
227219
confdir => $confdir,
228220
puppetdb_user => $puppetdb_user,

‎manifests/server/database.pp

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
$facts_blacklist = $puppetdb::params::facts_blacklist,
1717
$gc_interval = $puppetdb::params::gc_interval,
1818
$node_purge_gc_batch_limit = $puppetdb::params::node_purge_gc_batch_limit,
19-
$log_slow_statements = $puppetdb::params::log_slow_statements,
2019
$conn_max_age = $puppetdb::params::conn_max_age,
21-
$conn_keep_alive = $puppetdb::params::conn_keep_alive,
2220
$conn_lifetime = $puppetdb::params::conn_lifetime,
2321
$confdir = $puppetdb::params::confdir,
2422
$puppetdb_user = $puppetdb::params::puppetdb_user,
@@ -73,15 +71,8 @@
7371
}
7472

7573
if $database == 'embedded' {
76-
77-
$classname = 'org.hsqldb.jdbcDriver'
78-
$subprotocol = 'hsqldb'
7974
$subname = "file:${database_embedded_path};hsqldb.tx=mvcc;sql.syntax_pgs=true"
80-
8175
} elsif $database == 'postgres' {
82-
$classname = 'org.postgresql.Driver'
83-
$subprotocol = 'postgresql'
84-
8576
if !empty($jdbc_ssl_properties) {
8677
$database_suffix = $jdbc_ssl_properties
8778
}
@@ -121,16 +112,6 @@
121112
}
122113
}
123114

124-
ini_setting { 'puppetdb_classname':
125-
setting => 'classname',
126-
value => $classname,
127-
}
128-
129-
ini_setting { 'puppetdb_subprotocol':
130-
setting => 'subprotocol',
131-
value => $subprotocol,
132-
}
133-
134115
ini_setting { 'puppetdb_pgs':
135116
setting => 'syntax_pgs',
136117
value => true,
@@ -166,21 +147,11 @@
166147
value => $report_ttl,
167148
}
168149

169-
ini_setting { 'puppetdb_log_slow_statements':
170-
setting => 'log-slow-statements',
171-
value => $log_slow_statements,
172-
}
173-
174150
ini_setting { 'puppetdb_conn_max_age':
175151
setting => 'conn-max-age',
176152
value => $conn_max_age,
177153
}
178154

179-
ini_setting { 'puppetdb_conn_keep_alive':
180-
setting => 'conn-keep-alive',
181-
value => $conn_keep_alive,
182-
}
183-
184155
ini_setting { 'puppetdb_conn_lifetime':
185156
setting => 'conn-lifetime',
186157
value => $conn_lifetime,

‎manifests/server/read_database.pp

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
$manage_db_password = $puppetdb::params::manage_read_db_password,
1010
$jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,
1111
$database_validate = $puppetdb::params::read_database_validate,
12-
$log_slow_statements = $puppetdb::params::read_log_slow_statements,
1312
$conn_max_age = $puppetdb::params::read_conn_max_age,
14-
$conn_keep_alive = $puppetdb::params::read_conn_keep_alive,
1513
$conn_lifetime = $puppetdb::params::read_conn_lifetime,
1614
$confdir = $puppetdb::params::confdir,
1715
$puppetdb_user = $puppetdb::params::puppetdb_user,
@@ -66,9 +64,6 @@
6664
}
6765

6866
if $read_database == 'postgres' {
69-
$classname = 'org.postgresql.Driver'
70-
$subprotocol = 'postgresql'
71-
7267
if !empty($jdbc_ssl_properties) {
7368
$database_suffix = $jdbc_ssl_properties
7469
}
@@ -107,16 +102,6 @@
107102
}
108103
}
109104

110-
ini_setting { 'puppetdb_read_classname':
111-
setting => 'classname',
112-
value => $classname,
113-
}
114-
115-
ini_setting { 'puppetdb_read_subprotocol':
116-
setting => 'subprotocol',
117-
value => $subprotocol,
118-
}
119-
120105
ini_setting { 'puppetdb_read_pgs':
121106
setting => 'syntax_pgs',
122107
value => true,
@@ -127,21 +112,11 @@
127112
value => $subname,
128113
}
129114

130-
ini_setting { 'puppetdb_read_log_slow_statements':
131-
setting => 'log-slow-statements',
132-
value => $log_slow_statements,
133-
}
134-
135115
ini_setting { 'puppetdb_read_conn_max_age':
136116
setting => 'conn-max-age',
137117
value => $conn_max_age,
138118
}
139119

140-
ini_setting { 'puppetdb_read_conn_keep_alive':
141-
setting => 'conn-keep-alive',
142-
value => $conn_keep_alive,
143-
}
144-
145120
ini_setting { 'puppetdb_read_conn_lifetime':
146121
setting => 'conn-lifetime',
147122
value => $conn_lifetime,

0 commit comments

Comments
 (0)