Don't reload PostgreSQL config while running custom bootstrap (#3563)

Close #3558

Author: CyberDem0n

patroni/postgresql/__init__.py

@@ -96,11 +96,11 @@ def __init__(self, config: Dict[str, Any], mpp: AbstractMPP) -> None:
         self._bin_dir = config.get('bin_dir') or ''
         self._role_lock = Lock()
         self.set_role(PostgresqlRole.UNINITIALIZED)
+        self.bootstrap = Bootstrap(self)
+        self.bootstrapping = False
         self.config = ConfigHandler(self, config)
         self.config.check_directories()
 
-        self.bootstrap = Bootstrap(self)
-        self.bootstrapping = False
         self.__thread_ident = current_thread().ident
 
         self.slots_handler = SlotsHandler(self)

patroni/postgresql/config.py

@@ -1203,7 +1203,8 @@ def reload_config(self, config: Dict[str, Any], sighup: bool = False) -> None:
 
         conf_changed = hba_changed = ident_changed = local_connection_address_changed = False
         param_diff = CaseInsensitiveDict()
-        if self._postgresql.state == PostgresqlState.RUNNING:
+        if not self._postgresql.bootstrap.running_custom_bootstrap and \
+                self._postgresql.state == PostgresqlState.RUNNING:
             changes = CaseInsensitiveDict({p: v for p, v in server_parameters.items()
                                            if p not in params_skip_changes})
             changes.update({p: None for p in self._server_parameters.keys()
@@ -1276,6 +1277,9 @@ def reload_config(self, config: Dict[str, Any], sighup: bool = False) -> None:
         proxy_addr = config.get('proxy_address')
         self._postgresql.proxy_url = uri('postgres', proxy_addr, self._postgresql.database) if proxy_addr else None
 
+        if self._postgresql.bootstrap.running_custom_bootstrap:
+            return logger.info('Skipping PostgreSQL configuration update while in custom bootstrap.')
+
         if conf_changed or sighup:
             self.write_postgresql_conf()
 

tests/test_bootstrap.py

@@ -245,11 +245,15 @@ def test_post_bootstrap(self):
 
         self.b.bootstrap(config)
         self.p.set_state(PostgresqlState.STOPPED)
-        self.p.reload_config({'authentication': {'superuser': {'username': 'p', 'password': 'p'},
-                                                 'replication': {'username': 'r', 'password': 'r'},
-                                                 'rewind': {'username': 'rw', 'password': 'rw'}},
-                              'listen': '*', 'retry_timeout': 10,
-                              'parameters': {'wal_level': '', 'hba_file': 'foo', 'max_prepared_transactions': 10}})
+        with patch('patroni.postgresql.config.logger.info') as mock_logger:
+            self.p.reload_config({'authentication': {'superuser': {'username': 'p', 'password': 'p'},
+                                                     'replication': {'username': 'r', 'password': 'r'},
+                                                     'rewind': {'username': 'rw', 'password': 'rw'}},
+                                  'listen': '*', 'retry_timeout': 10,
+                                  'parameters': {'wal_level': '', 'hba_file': 'foo', 'max_prepared_transactions': 10}})
+            mock_logger.assert_called_once()
+            self.assertEqual(mock_logger.call_args[0][0],
+                             'Skipping PostgreSQL configuration update while in custom bootstrap.')
         with patch.object(Postgresql, 'major_version', PropertyMock(return_value=110000)), \
                 patch.object(Postgresql, 'restart', Mock()) as mock_restart:
             self.b.post_bootstrap({}, task)