Patroni 3.3.1 (#1001)

Author: hughcapet

postgres-appliance/Dockerfile

@@ -73,7 +73,7 @@ COPY --from=dependencies-builder /builddeps/wal-g /usr/local/bin/
 COPY build_scripts/patroni_wale.sh build_scripts/compress_build.sh /builddeps/
 
 # Install patroni and wal-e
-ENV PATRONIVERSION=3.2.2
+ENV PATRONIVERSION=3.3.1
 ENV WALE_VERSION=1.1.1
 
 WORKDIR /

postgres-appliance/major_upgrade/inplace_upgrade.py

@@ -14,6 +14,7 @@
 from collections import defaultdict
 from threading import Thread
 from multiprocessing.pool import ThreadPool
+from patroni import global_config
 
 logger = logging.getLogger(__name__)
 
@@ -130,12 +131,11 @@ def check_patroni_api(self, member):
             return logger.error('API request to %s name failed: %r', member.name, e)
 
     def toggle_pause(self, paused):
-        from patroni.config import get_global_config
         from patroni.utils import polling_loop
 
         cluster = self.dcs.get_cluster()
         config = cluster.config.data.copy()
-        if get_global_config(cluster).is_paused == paused:
+        if global_config.from_cluster(cluster).is_paused == paused:
             return logger.error('Cluster is %spaused, can not continue', ('' if paused else 'not '))
 
         config['pause'] = paused
@@ -203,15 +203,14 @@ def ensure_replica_state(member):
         return all(ensure_replica_state(member) for member in cluster.members if member.name != self.postgresql.name)
 
     def sanity_checks(self, cluster):
-        from patroni.config import get_global_config
 
         if not cluster.initialize:
             return logger.error('Upgrade can not be triggered because the cluster is not initialized')
 
         if len(cluster.members) != self.replica_count:
             return logger.error('Upgrade can not be triggered because the number of replicas does not match (%s != %s)',
                                 len(cluster.members), self.replica_count)
-        if get_global_config(cluster).is_paused:
+        if global_config.from_cluster(cluster).is_paused:
             return logger.error('Upgrade can not be triggered because Patroni is in maintenance mode')
 
         lock_owner = cluster.leader and cluster.leader.name
@@ -319,7 +318,7 @@ def stop_rsyncd(self):
                 shutil.rmtree(self.rsyncd_conf_dir)
                 self.rsyncd_configs_created = False
             except Exception as e:
-                logger.error('Failed to remove %s: %r', self.rsync_conf_dir, e)
+                logger.error('Failed to remove %s: %r', self.rsyncd_conf_dir, e)
 
     def checkpoint(self, member):
         name, (_, cur) = member

postgres-appliance/major_upgrade/pg_upgrade.py

@@ -5,6 +5,7 @@
 import psutil
 
 from patroni.postgresql import Postgresql
+from patroni.postgresql.mpp import get_mpp
 
 logger = logging.getLogger(__name__)
 
@@ -302,6 +303,6 @@ def PostgresqlUpgrade(config):
     is_running = _PostgresqlUpgrade.is_running
     _PostgresqlUpgrade.is_running = lambda s: False
     try:
-        return _PostgresqlUpgrade(config['postgresql'])
+        return _PostgresqlUpgrade(config['postgresql'], get_mpp(config))
     finally:
         _PostgresqlUpgrade.is_running = is_running