Merge ~paelzer/ubuntu/+source/resource-agents:xenial-1749283-postgresdir into ubuntu/+source/resource-agents:ubuntu/xenial-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

The SRU template isn't ready yet as I wait for some feedback.
But the suggested fix can be reviewed already here.

A PPA with a build is available at https://launchpad.net/~paelzer/+archive/ubuntu/bug-1749283-resource-agent-to-start-pgsql/+packages

[Andreas Hasenack (ahasenack)]

Fix looks good, but I wonder if we shouldn't also fix it in postgresql-common via systemd tempfiles as was also suggested. Not for an SRU perhaps, but in disco?

review: Approve

[Christian Ehrhardt  (paelzer)]

self-rejecting as Mmike said he will fix it.

Unmerged commits

b62d92c... by Christian Ehrhardt  on 2019-03-25

changelog: fix start of postgresql to provide the expected stats_temp_directory (LP: #1749283)

Signed-off-by: Christian Ehrhardt <email address hidden>

31bdbbe... by Christian Ehrhardt  on 2019-03-25

d/p/lp-1749283-pgsql-stats_temp_directory.patch: fix start of
postgresql to provide the expected stats_temp_directory (LP: #1749283)

Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 3932f71..ede8599 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+resource-agents (1:3.9.7-1ubuntu0.1) xenial; urgency=medium
+
+  * d/p/lp-1749283-pgsql-stats_temp_directory.patch: fix start of
+    postgresql to provide the expected stats_temp_directory (LP: #1749283)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 25 Mar 2019 12:36:09 +0100
+
 resource-agents (1:3.9.7-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/lp-1749283-pgsql-stats_temp_directory.patch b/debian/patches/lp-1749283-pgsql-stats_temp_directory.patch
new file mode 100644
index 0000000..8b8e7ae
--- /dev/null
+++ b/debian/patches/lp-1749283-pgsql-stats_temp_directory.patch
@@ -0,0 +1,76 @@
+From 00d888c00651eb178dc3a97d50359571963b5d44 Mon Sep 17 00:00:00 2001
+From: Valentin Vidic <[e-mail]>
+Date: Fri, 9 Feb 2018 12:30:29 +0100
+Subject: [PATCH] pgsql: try to create stats_temp_directory
+
+Database fails to start correctly if the stats_temp_directory
+is specified in the configuration but does not exists.
+
+Origin: upstream, https://github.com/ClusterLabs/resource-agents/pull/1102/commits/00d888c00651eb178dc3a97d50359571963b5d44
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1749283
+Last-Update: 2019-03-25
+
+---
+ heartbeat/pgsql | 39 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 39 insertions(+)
+
+diff --git a/heartbeat/pgsql b/heartbeat/pgsql
+index 3ded3ca2e..3e0158adb 100755
+--- a/heartbeat/pgsql
++++ b/heartbeat/pgsql
+@@ -575,6 +575,8 @@ pgsql_real_start() {
+         check_socket_dir
+     fi
+ 
++    check_stat_temp_directory
++
+     if [ "$OCF_RESKEY_rep_mode" = "slave" ]; then
+         rm -f $RECOVERY_CONF
+         make_recovery_conf || return $OCF_ERR_GENERIC
+@@ -1977,6 +1979,43 @@ check_log_file() {
+     return 0
+ }
+ 
++#
++# Check if we need to create stats temp directory in tmpfs
++#
++
++check_stat_temp_directory() {
++    local stats_temp
++
++    stats_temp=`get_pgsql_param stats_temp_directory`
++
++    if [ -z "$stats_temp" ]; then
++        return
++    fi
++
++    if [ "${stats_temp#/}" = "$stats_temp" ]; then
++        stats_temp="$OCF_RESKEY_pgdata/$stats_temp"
++    fi
++
++    if [ -d "$stats_temp" ]; then
++        return
++    fi
++
++    if ! mkdir -p "$stats_temp"; then
++        ocf_exit_reason "Can't create directory $stats_temp"
++        exit $OCF_ERR_PERM
++    fi
++
++    if ! chown $OCF_RESKEY_pgdba: "$stats_temp"; then
++        ocf_exit_reason "Can't change ownership for $stats_temp"
++        exit $OCF_ERR_PERM
++    fi
++
++    if ! chmod 750 "$stats_temp"; then
++        ocf_exit_reason "Can't change permissions for $stats_temp"
++        exit $OCF_ERR_PERM
++    fi
++}
++
+ #
+ # Check socket directory
+ #
+-- 
+2.17.1
+
diff --git a/debian/patches/series b/debian/patches/series
index a467edb..8d8e742 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 mysql-path.patch
 no-dirty-version
 runocft
+lp-1749283-pgsql-stats_temp_directory.patch