Merge pull request #38 from cybertec-postgresql/upgrade_fixes

Cleanup Dockerfile, Update Makefile and Upgrade fixes

Author: Schmaetz

Makefile

@@ -17,6 +17,7 @@ BUILD ?= 1
 ARCH ?= amd64
 IMAGE_TAG ?= $(BASEOS)-$(PGVERSION_FULL)-$(BUILD)
 POSTGIS_IMAGE_TAG ?= $(BASEOS)-$(PGVERSION_FULL)-$(POSTGIS_VERSION)-$(BUILD)
+ARCH ?= amd64
 
 # Settings for the Build-Process
 BUILDWITH ?= docker
@@ -78,7 +79,7 @@ postgres-build:
 			--build-arg PATRONI_VERSION=$(PATRONI_VERSION) 						\
 			--build-arg OLD_PG_VERSIONS="$(OLD_PG_VERSIONS)"					\
 			--build-arg PGVERSION=$(PGVERSION)									\
-			--build-arg ARCH=$(ARCH)			
+			--build-arg ARCH=$(ARCH)						
 
 postgres: postgres-build
 

docker/postgres/Dockerfile

@@ -60,9 +60,8 @@ RUN ${PACKAGER} -y update && ${PACKAGER} -y install --nodocs --noplugins --setop
 		&& ${PACKAGER} -y clean all;
 
 # install etcdctl
-RUN ETCDVERSION=3.5.13 && ARCH=amd64 \
-    && curl -L https://github.com/coreos/etcd/releases/download/v${ETCDVERSION}/etcd-v${ETCDVERSION}-linux-${ARCH}.tar.gz \
-    | tar xf -C /bin --strip=1 --wildcards --no-anchored --no-same-owner etcdctl etcd;
+RUN ETCDVERSION=3.5.1 \
+    && curl -L https://github.com/coreos/etcd/releases/download/v${ETCDVERSION}/etcd-v${ETCDVERSION}-linux-${ARCH}.tar.gz | tar xz -C /bin --strip=1 --wildcards --no-anchored --no-same-owner etcdctl etcd;
 
 ENV PATHBACKUP = $PATH
 

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,13 @@ 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
@@ -490,7 +488,7 @@ def do_upgrade(self):
                         self.cluster_version, self.desired_version)
             return True
 
-        if not (self.postgresql.is_running() and self.postgresql.is_leader()):
+        if not (self.postgresql.is_running() and self.postgresql.is_primary()):
             return logger.error('PostgreSQL is not running or in recovery')
 
         cluster = self.dcs.get_cluster()

major_upgrade/pg_upgrade.py

@@ -11,7 +11,7 @@
 
 class _PostgresqlUpgrade(Postgresql):
 
-    _INCOMPATIBLE_EXTENSIONS = ('amcheck_next', 'pg_repack',)
+    _INCOMPATIBLE_EXTENSIONS = ('pgaudit',)
 
     def adjust_shared_preload_libraries(self, version):
         from spilo_commons import adjust_extensions
@@ -58,7 +58,7 @@ def set_bin_dir(self, version):
 
     @property
     def local_conn_kwargs(self):
-        conn_kwargs = self.config.local_connect_kwargs
+        conn_kwargs = self.connection_pool.conn_kwargs
         conn_kwargs['options'] = '-c synchronous_commit=local -c statement_timeout=0 -c search_path='
         conn_kwargs.pop('connect_timeout', None)
         return conn_kwargs
@@ -71,7 +71,6 @@ def drop_possibly_incompatible_extensions(self):
 
         logger.info('Dropping extensions from the cluster which could be incompatible')
         conn_kwargs = self.local_conn_kwargs
-
         for d in self._get_all_databases():
             conn_kwargs['dbname'] = d
             with get_connection_cursor(**conn_kwargs) as cur:
@@ -189,10 +188,10 @@ def pg_upgrade(self, check=False):
     def prepare_new_pgdata(self, version):
         from spilo_commons import append_extensions
 
-        locale = self.query('SHOW lc_collate').fetchone()[0]
-        encoding = self.query('SHOW server_encoding').fetchone()[0]
+        locale = self.query('SHOW lc_collate')[0][0]
+        encoding = self.query('SHOW server_encoding')[0][0]
         initdb_config = [{'locale': locale}, {'encoding': encoding}]
-        if self.query("SELECT current_setting('data_checksums')::bool").fetchone()[0]:
+        if self.query("SELECT current_setting('data_checksums')::bool")[0][0]:
             initdb_config.append('data-checksums')
 
         logger.info('initdb config: %s', initdb_config)