mirror of
https://github.com/outbackdingo/patroni.git
synced 2026-01-27 10:20:10 +00:00
Compatibility with 17-beta1 (#3076)
- updated list of GUCs - updated regex for filtering backend processes by name - `primary_conninfo` will contain `dbname` parameter The last one is required for synchronizing logical replication slots by slotsync worker and doesn't create problems on older versions.
This commit is contained in:
Alexander Kukushkin
committed by
GitHub
GitHub
parent
b6c5a12017
commit
1ed207cbf0
@@ -1,4 +1,7 @@
|
||||
parameters:
|
||||
allow_alter_system:
|
||||
- type: Bool
|
||||
version_from: 170000
|
||||
allow_in_place_tablespaces:
|
||||
- type: Bool
|
||||
version_from: 150000
|
||||
@@ -245,6 +248,12 @@ parameters:
|
||||
version_from: 90300
|
||||
min_val: 0
|
||||
max_val: 1000
|
||||
commit_timestamp_buffers:
|
||||
- type: Integer
|
||||
version_from: 170000
|
||||
min_val: 0
|
||||
max_val: 131072
|
||||
unit: 8kB
|
||||
compute_query_id:
|
||||
- type: EnumBool
|
||||
version_from: 140000
|
||||
@@ -299,6 +308,7 @@ parameters:
|
||||
db_user_namespace:
|
||||
- type: Bool
|
||||
version_from: 90300
|
||||
version_till: 170000
|
||||
deadlock_timeout:
|
||||
- type: Integer
|
||||
version_from: 90300
|
||||
@@ -313,6 +323,12 @@ parameters:
|
||||
debug_io_direct:
|
||||
- type: String
|
||||
version_from: 160000
|
||||
debug_logical_replication_streaming:
|
||||
- type: Enum
|
||||
version_from: 170000
|
||||
possible_values:
|
||||
- buffered
|
||||
- immediate
|
||||
debug_parallel_query:
|
||||
- type: EnumBool
|
||||
version_from: 160000
|
||||
@@ -406,6 +422,9 @@ parameters:
|
||||
enable_gathermerge:
|
||||
- type: Bool
|
||||
version_from: 100000
|
||||
enable_group_by_reordering:
|
||||
- type: Bool
|
||||
version_from: 170000
|
||||
enable_hashagg:
|
||||
- type: Bool
|
||||
version_from: 90300
|
||||
@@ -466,6 +485,9 @@ parameters:
|
||||
event_source:
|
||||
- type: String
|
||||
version_from: 90300
|
||||
event_triggers:
|
||||
- type: Bool
|
||||
version_from: 170000
|
||||
exit_on_error:
|
||||
- type: Bool
|
||||
version_from: 90300
|
||||
@@ -607,6 +629,12 @@ parameters:
|
||||
ignore_system_indexes:
|
||||
- type: Bool
|
||||
version_from: 90300
|
||||
io_combine_limit:
|
||||
- type: Integer
|
||||
version_from: 170000
|
||||
min_val: 1
|
||||
max_val: 32
|
||||
unit: 8kB
|
||||
IntervalStyle:
|
||||
- type: Enum
|
||||
version_from: 90300
|
||||
@@ -875,6 +903,7 @@ parameters:
|
||||
logical_replication_mode:
|
||||
- type: Enum
|
||||
version_from: 160000
|
||||
version_till: 170000
|
||||
possible_values:
|
||||
- buffered
|
||||
- immediate
|
||||
@@ -919,6 +948,11 @@ parameters:
|
||||
version_from: 100000
|
||||
min_val: 0
|
||||
max_val: 262143
|
||||
max_notify_queue_pages:
|
||||
- type: Integer
|
||||
version_from: 170000
|
||||
min_val: 64
|
||||
max_val: 2147483647
|
||||
max_parallel_apply_workers_per_subscription:
|
||||
- type: Integer
|
||||
version_from: 160000
|
||||
@@ -1072,9 +1106,28 @@ parameters:
|
||||
min_val: 2
|
||||
max_val: 2147483647
|
||||
unit: MB
|
||||
multixact_member_buffers:
|
||||
- type: Integer
|
||||
version_from: 170000
|
||||
min_val: 16
|
||||
max_val: 131072
|
||||
unit: 8kB
|
||||
multixact_offset_buffers:
|
||||
- type: Integer
|
||||
version_from: 170000
|
||||
min_val: 16
|
||||
max_val: 131072
|
||||
unit: 8kB
|
||||
notify_buffers:
|
||||
- type: Integer
|
||||
version_from: 170000
|
||||
min_val: 16
|
||||
max_val: 131072
|
||||
unit: 8kB
|
||||
old_snapshot_threshold:
|
||||
- type: Integer
|
||||
version_from: 90600
|
||||
version_till: 170000
|
||||
min_val: -1
|
||||
max_val: 86400
|
||||
unit: min
|
||||
@@ -1191,6 +1244,12 @@ parameters:
|
||||
version_from: 90300
|
||||
min_val: 0
|
||||
max_val: 1.79769e+308
|
||||
serializable_buffers:
|
||||
- type: Integer
|
||||
version_from: 170000
|
||||
min_val: 16
|
||||
max_val: 131072
|
||||
unit: 8kB
|
||||
session_preload_libraries:
|
||||
- type: String
|
||||
version_from: 90400
|
||||
@@ -1283,6 +1342,9 @@ parameters:
|
||||
standard_conforming_strings:
|
||||
- type: Bool
|
||||
version_from: 90300
|
||||
standby_slot_names:
|
||||
- type: String
|
||||
version_from: 170000
|
||||
statement_timeout:
|
||||
- type: Integer
|
||||
version_from: 90300
|
||||
@@ -1300,6 +1362,15 @@ parameters:
|
||||
- type: String
|
||||
version_from: 90300
|
||||
version_till: 150000
|
||||
subtransaction_buffers:
|
||||
- type: Integer
|
||||
version_from: 170000
|
||||
min_val: 0
|
||||
max_val: 131072
|
||||
unit: 8kB
|
||||
summarize_wal:
|
||||
- type: Bool
|
||||
version_from: 170000
|
||||
superuser_reserved_connections:
|
||||
- type: Integer
|
||||
version_from: 90300
|
||||
@@ -1310,6 +1381,9 @@ parameters:
|
||||
version_from: 90600
|
||||
min_val: 0
|
||||
max_val: 262143
|
||||
sync_replication_slots:
|
||||
- type: Bool
|
||||
version_from: 170000
|
||||
synchronize_seqscans:
|
||||
- type: Bool
|
||||
version_from: 90300
|
||||
@@ -1394,12 +1468,16 @@ parameters:
|
||||
timezone_abbreviations:
|
||||
- type: String
|
||||
version_from: 90300
|
||||
trace_connection_negotiation:
|
||||
- type: Bool
|
||||
version_from: 170000
|
||||
trace_notify:
|
||||
- type: Bool
|
||||
version_from: 90300
|
||||
trace_recovery_messages:
|
||||
- type: Enum
|
||||
version_from: 90300
|
||||
version_till: 170000
|
||||
possible_values:
|
||||
- debug5
|
||||
- debug4
|
||||
@@ -1452,6 +1530,12 @@ parameters:
|
||||
track_wal_io_timing:
|
||||
- type: Bool
|
||||
version_from: 140000
|
||||
transaction_buffers:
|
||||
- type: Integer
|
||||
version_from: 170000
|
||||
min_val: 0
|
||||
max_val: 131072
|
||||
unit: 8kB
|
||||
transaction_deferrable:
|
||||
- type: Bool
|
||||
version_from: 90300
|
||||
@@ -1466,6 +1550,12 @@ parameters:
|
||||
transaction_read_only:
|
||||
- type: Bool
|
||||
version_from: 90300
|
||||
transaction_timeout:
|
||||
- type: Integer
|
||||
version_from: 170000
|
||||
min_val: 0
|
||||
max_val: 2147483647
|
||||
unit: ms
|
||||
transform_null_equals:
|
||||
- type: Bool
|
||||
version_from: 90300
|
||||
@@ -1664,6 +1754,12 @@ parameters:
|
||||
min_val: 0
|
||||
max_val: 2147483647
|
||||
unit: kB
|
||||
wal_summary_keep_time:
|
||||
- type: Integer
|
||||
version_from: 170000
|
||||
min_val: 0
|
||||
max_val: 35791394
|
||||
unit: min
|
||||
wal_sync_method:
|
||||
- type: Enum
|
||||
version_from: 90300
|
||||
|
||||
@@ -114,16 +114,17 @@ def parse_dsn(value: str) -> Optional[Dict[str, str]]:
|
||||
"""
|
||||
Very simple equivalent of `psycopg2.extensions.parse_dsn` introduced in 2.7.0.
|
||||
We are not using psycopg2 function in order to remain compatible with 2.5.4+.
|
||||
There is one minor difference though, this function removes `dbname` from the result
|
||||
and sets the `sslmode`, 'gssencmode', and `channel_binding` to `prefer` if it is not present in
|
||||
the connection string. This is necessary to simplify comparison of the old and the new values.
|
||||
There are a few minor differences though, this function sets the `sslmode`, 'gssencmode',
|
||||
and `channel_binding` to `prefer` if they are not present in the connection string.
|
||||
This is necessary to simplify comparison of the old and the new values.
|
||||
|
||||
>>> r = parse_dsn('postgresql://u%2Fse:pass@:%2f123,[::1]/db%2Fsdf?application_name=mya%2Fpp&ssl=true')
|
||||
>>> r == {'application_name': 'mya/pp', 'host': ',::1', 'sslmode': 'require',\
|
||||
>>> r == {'application_name': 'mya/pp', 'dbname': 'db/sdf', 'host': ',::1', 'sslmode': 'require',\
|
||||
'password': 'pass', 'port': '/123,', 'user': 'u/se', 'gssencmode': 'prefer', 'channel_binding': 'prefer'}
|
||||
True
|
||||
>>> r = parse_dsn(" host = 'host' dbname = db\\\\ name requiressl=1 ")
|
||||
>>> r == {'host': 'host', 'sslmode': 'require', 'gssencmode': 'prefer', 'channel_binding': 'prefer'}
|
||||
>>> r == {'dbname': 'db name', 'host': 'host', 'sslmode': 'require',\
|
||||
'gssencmode': 'prefer', 'channel_binding': 'prefer'}
|
||||
True
|
||||
>>> parse_dsn('requiressl = 0\\\\') == {'sslmode': 'prefer', 'gssencmode': 'prefer', 'channel_binding': 'prefer'}
|
||||
True
|
||||
@@ -147,8 +148,6 @@ def parse_dsn(value: str) -> Optional[Dict[str, str]]:
|
||||
elif requiressl is not None:
|
||||
ret['sslmode'] = 'prefer'
|
||||
ret.setdefault('sslmode', 'prefer')
|
||||
if 'dbname' in ret:
|
||||
del ret['dbname']
|
||||
ret.setdefault('gssencmode', 'prefer')
|
||||
ret.setdefault('channel_binding', 'prefer')
|
||||
return ret
|
||||
@@ -570,8 +569,8 @@ class ConfigHandler(object):
|
||||
ret.setdefault('channel_binding', 'prefer')
|
||||
if self._krbsrvname:
|
||||
ret['krbsrvname'] = self._krbsrvname
|
||||
if 'dbname' in ret:
|
||||
del ret['dbname']
|
||||
if not ret.get('dbname'):
|
||||
ret['dbname'] = self._postgresql.database
|
||||
return ret
|
||||
|
||||
def format_dsn(self, params: Dict[str, Any]) -> str:
|
||||
@@ -771,12 +770,21 @@ class ConfigHandler(object):
|
||||
elif not primary_conninfo:
|
||||
return False
|
||||
|
||||
if self._postgresql.major_version < 170000:
|
||||
# we want to compare dbname in primary_conninfo only for v17 onwards
|
||||
wanted_primary_conninfo.pop('dbname', None)
|
||||
|
||||
if not self._postgresql.is_starting():
|
||||
wal_receiver_primary_conninfo = self._postgresql.primary_conninfo()
|
||||
if wal_receiver_primary_conninfo:
|
||||
wal_receiver_primary_conninfo = parse_dsn(wal_receiver_primary_conninfo)
|
||||
# when wal receiver is alive use primary_conninfo from pg_stat_wal_receiver for comparison
|
||||
if wal_receiver_primary_conninfo:
|
||||
# dbname in pg_stat_wal_receiver is always `replication`, we need to use a "real" one
|
||||
wal_receiver_primary_conninfo.pop('dbname', None)
|
||||
dbname = primary_conninfo.get('dbname')
|
||||
if dbname:
|
||||
wal_receiver_primary_conninfo['dbname'] = dbname
|
||||
primary_conninfo = wal_receiver_primary_conninfo
|
||||
# There could be no password in the primary_conninfo or it is masked.
|
||||
# Just copy the "desired" value in order to make comparison succeed.
|
||||
|
||||
@@ -176,11 +176,15 @@ class PostmasterProcess(psutil.Process):
|
||||
return not self.is_running()
|
||||
|
||||
def wait_for_user_backends_to_close(self, stop_timeout: Optional[float]) -> None:
|
||||
# These regexps are cross checked against versions PostgreSQL 9.1 .. 16
|
||||
# These regexps are cross checked against versions PostgreSQL 9.1 .. 17
|
||||
aux_proc_re = re.compile("(?:postgres:)( .*:)? (?:(?:archiver|startup|autovacuum launcher|autovacuum worker|"
|
||||
"checkpointer|logger|stats collector|wal receiver|wal writer|writer)(?: process )?|"
|
||||
"walreceiver|wal sender process|walsender|walwriter|background writer|"
|
||||
"logical replication launcher|logical replication worker for|bgworker:) ")
|
||||
"logical replication launcher|logical replication worker for subscription|"
|
||||
"logical replication tablesync worker for subscription|"
|
||||
"logical replication parallel apply worker for subscription|"
|
||||
"logical replication apply worker for subscription|"
|
||||
"slotsync worker|walsummarizer|bgworker:) ")
|
||||
|
||||
try:
|
||||
children = self.children()
|
||||
|
||||
@@ -294,7 +294,7 @@ class TestPostgresql(BaseTestPostgresql):
|
||||
mock_get_pg_settings.return_value['recovery_min_apply_delay'][1] = '1'
|
||||
self.assertEqual(self.p.config.check_recovery_conf(None), (True, True))
|
||||
mock_get_pg_settings.return_value['primary_conninfo'][1] = 'host=1 target_session_attrs=read-write'\
|
||||
+ ' passfile=' + re.sub(r'([\'\\ ])', r'\\\1', self.p.config._pgpass)
|
||||
+ ' dbname=postgres passfile=' + re.sub(r'([\'\\ ])', r'\\\1', self.p.config._pgpass)
|
||||
mock_get_pg_settings.return_value['recovery_min_apply_delay'][1] = '0'
|
||||
self.assertEqual(self.p.config.check_recovery_conf(None), (True, True))
|
||||
self.p.config.write_recovery_conf({'standby_mode': 'on', 'primary_conninfo': conninfo.copy()})
|
||||
|
||||
@@ -132,14 +132,16 @@ class TestPostmasterProcess(unittest.TestCase):
|
||||
c2.cmdline = Mock(return_value=["postgres: postgres postgres [local] idle"])
|
||||
c3 = Mock()
|
||||
c3.cmdline = Mock(side_effect=psutil.NoSuchProcess(123))
|
||||
c4 = Mock()
|
||||
c4.cmdline = Mock(return_value=['postgres: slotsync worker '])
|
||||
mock_wait.return_value = ([], [c2])
|
||||
with patch('psutil.Process.children', Mock(return_value=[c1, c2, c3])):
|
||||
with patch('psutil.Process.children', Mock(return_value=[c1, c2, c3, c4])):
|
||||
proc = PostmasterProcess(123)
|
||||
self.assertIsNone(proc.wait_for_user_backends_to_close(1))
|
||||
mock_wait.assert_called_with([c2], 1)
|
||||
|
||||
mock_wait.return_value = ([c2], [])
|
||||
with patch('psutil.Process.children', Mock(return_value=[c1, c2, c3])):
|
||||
with patch('psutil.Process.children', Mock(return_value=[c1, c2, c3, c4])):
|
||||
proc = PostmasterProcess(123)
|
||||
proc.wait_for_user_backends_to_close(1)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user