Skip to content

Commit b3ae865

Browse files
authored
Explicitly include CMDLINE_OPTIONS GUCs when querying pg_settings (patroni#3157)
followup on patroni#2993
1 parent 66f98c8 commit b3ae865

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

patroni/postgresql/config.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,9 @@ def load_current_server_parameters(self) -> None:
365365
keep_values = {k: self._server_parameters[k] for k in exclude}
366366
server_parameters = CaseInsensitiveDict({r[0]: r[1] for r in self._postgresql.query(
367367
"SELECT name, pg_catalog.current_setting(name) FROM pg_catalog.pg_settings"
368-
" WHERE (source IN ('command line', 'environment variable') OR sourcefile = %s)"
369-
" AND pg_catalog.lower(name) != ALL(%s)", self._postgresql_conf, exclude)})
368+
" WHERE (source IN ('command line', 'environment variable') OR sourcefile = %s"
369+
" OR pg_catalog.lower(name) = ANY(%s)) AND pg_catalog.lower(name) != ALL(%s)",
370+
self._postgresql_conf, [n.lower() for n in self.CMDLINE_OPTIONS.keys()], exclude)})
370371
recovery_params = CaseInsensitiveDict({k: server_parameters.pop(k) for k in self._RECOVERY_PARAMETERS
371372
if k in server_parameters})
372373
# We also want to load current settings of recovery parameters, including primary_conninfo

0 commit comments

Comments
 (0)