[Piuparts-commits] [piuparts] 01/01: wheezy->jessie: restart postgresql before upgrading the cluster

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 8403175685966ff99b7e8fb49f687fbc1b4c1604
Author: Andreas Beckmann <anbe at debian.org>
Date:   Thu Dec 14 20:47:07 2017 +0100

    wheezy->jessie: restart postgresql before upgrading the cluster
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 custom-scripts/scripts/pre_distupgrade_zz_database-server | 7 ++++++-
 debian/changelog                                          | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/custom-scripts/scripts/pre_distupgrade_zz_database-server b/custom-scripts/scripts/pre_distupgrade_zz_database-server
index 55af05c..ef93317 100755
--- a/custom-scripts/scripts/pre_distupgrade_zz_database-server
+++ b/custom-scripts/scripts/pre_distupgrade_zz_database-server
@@ -109,6 +109,11 @@ upgrade_pg_cluster()
 
 	if is_installed postgresql-${from} && is_installed postgresql-${to}
 	then
+		if [ "$3" = "--restart-first" ]; then
+			echo ""
+			echo "Restarting PostgreSQL (#882409)..."
+			invoke-rc.d postgresql restart
+		fi
 		echo ""
 		echo "Upgrading PostgreSQL Cluster from ${from} to ${to}"
 		pg_dropcluster ${to} main --stop
@@ -125,7 +130,7 @@ case "${PIUPARTS_DISTRIBUTION}:${PIUPARTS_DISTRIBUTION_NEXT}" in
 		upgrade_pg_cluster 8.4 9.1
 		;;
 	wheezy:jessie)
-		upgrade_pg_cluster 9.1 9.4
+		upgrade_pg_cluster 9.1 9.4 --restart-first
 		;;
 	jessie:stretch)
 		upgrade_pg_cluster 9.4 9.6
diff --git a/debian/changelog b/debian/changelog
index 9447419..009727c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ piuparts (0.83) UNRELEASED; urgency=medium
       piuparts-report to exclude (most of) these logfiles from the report.
   * master-bin/report_newly_bugged_packages: Remove, merged into
     piuparts-analyze.
+  * scripts/pre_distupgrade_zz_database-server: wheezy->jessie: Restart
+    postgresql before upgrading the cluster, working around #882409.
   * Update policy references, the permalinks changed with the new toolchain.
   * Add bug template for failing to reinstall a package.
   * Adjust known_problems patterns for dpkg 1.19 message changes.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git