Merge ~michal-maloszewski99/ubuntu/+source/resource-agents:wal-postgresql-jammy-lp2013084 into ubuntu/+source/resource-agents:ubuntu/jammy-devel

[Michał Małoszewski]

PPA: https://launchpad.net/~michal-maloszewski99/+archive/ubuntu/jammy-wal-receiver-naming-lp-2013084

[Michał Małoszewski (michal-maloszewski99)]

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-jammy-wal-receiver-naming-lp-2013084/?format=plain)
  resource-agents @ amd64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-jammy-wal-receiver-naming-lp-2013084/jammy/amd64/r/resource-agents/20230503_102034_4bf00@/log.gz
    03.05.23 10:20:34 ✅ Triggers: resource-agents/1:4.7.0-1ubuntu7.2~ppa1
  resource-agents @ arm64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-jammy-wal-receiver-naming-lp-2013084/jammy/arm64/r/resource-agents/20230503_104008_dc154@/log.gz
    03.05.23 10:40:08 ✅ Triggers: resource-agents/1:4.7.0-1ubuntu7.2~ppa1
  resource-agents @ armhf:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-jammy-wal-receiver-naming-lp-2013084/jammy/armhf/r/resource-agents/20230503_100334_25e5b@/log.gz
    03.05.23 10:03:34 ✅ Triggers: resource-agents/1:4.7.0-1ubuntu7.2~ppa1
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-jammy-wal-receiver-naming-lp-2013084/jammy/armhf/r/resource-agents/20230503_100354_7245f@/log.gz
    03.05.23 10:03:54 ✅ Triggers: resource-agents/1:4.7.0-1ubuntu7.2~ppa1
  resource-agents @ ppc64el:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-jammy-wal-receiver-naming-lp-2013084/jammy/ppc64el/r/resource-agents/20230503_101310_11793@/log.gz
    03.05.23 10:13:10 ✅ Triggers: resource-agents/1:4.7.0-1ubuntu7.2~ppa1

[Michał Małoszewski (michal-maloszewski99)]

working on the sru template

[Michał Małoszewski (michal-maloszewski99)]

sru template attached to the bug report

[Athos Ribeiro (athos-ribeiro)]

Thanks Michal! This is looking great so far :)

I added 2 comments below with some suggestions for your DEP3 headers.

Also, it would be nice to update the SRU template test plan in the "actual" and "expected" results to emphasize what kind of output the tester should expect. Should the running program fail in any of the cases? how would the failure manifest itself? What a successful run (fix) looks like?

review: Needs Information

[Michał Małoszewski (michal-maloszewski99)]

Hi Athos,

Thank you for taking a look.
DEP3 headers + SRU template (actual/expected result) changed.
It can be re-reviewed.

[Athos Ribeiro (athos-ribeiro)]

Thanks, Michal! I added another inline comment and am discussing an SRU template snippet below:

> Actual result:

> After typing in: "ps -ef" the wal receiver process should be named "wal receiver process".

> Expected result:

> If the monitor function is triggered, then after typing in: "ps -ef" the wal receiver process should be named "walreceiver".

The patch is __not__ changing the name of the process at all. It changes the string that the pgsql monitor looks for, when monitoring the process. Therefore, using `ps` to describe actual/expected behaviors does not seem to be the best approach here.

[Michał Małoszewski (michal-maloszewski99)]

Hi Athos, thanks for review update from you. I updated the patch according to the comment added inline.
Moreover, I brushed up a bit on the "results section" and yeah, indeed, the fix is about the monitor function as well, so it was hard for me to imagine a bit of the operation without performing test steps, but after the fix, the monitor function should operate correctly. I think that my sentences there now are better than the previous ones, and say the tester that the expected and actual problem is about the monitor function and that string which that function is looking for.

So it can be re-reviewed.

[Athos Ribeiro (athos-ribeiro)]

Thanks Michal!

The patch LGTM. The SRU test plan could still be more descriptive, but I will leave that to the SRU team to decide (see https://bugs.launchpad.net/ubuntu/+source/resource-agents/+bug/2013084/comments/8).

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: athos-ribeiro, michal-maloszewski99
Uploaders: athos-ribeiro
MP auto-approved

review: Approve

[Athos Ribeiro (athos-ribeiro)]

On a second thought, before uploading this, it would be nice to double check the status of LP: #1981598 since there is an update in proposed there for a while now (https://ubuntu-archive-team.ubuntu.com/proposed-migration/jammy/update_excuses.html#resource-agents)

[Athos Ribeiro (athos-ribeiro)]

To avoid blocking Michal any further, I uploaded this one:

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading resource-agents_4.7.0-1ubuntu7.2.dsc: done.
  Uploading resource-agents_4.7.0-1ubuntu7.2.debian.tar.xz: done.
  Uploading resource-agents_4.7.0-1ubuntu7.2_source.buildinfo: done.
  Uploading resource-agents_4.7.0-1ubuntu7.2_source.changes: done.
Successfully uploaded packages.

Make sure to check the status of LP: #1981598. If this should override the update in proposed so both land in updates together, we will need a second upload to also include 4.7.0-1ubuntu7.1 changelog entries in our upload.

[Michał Małoszewski (michal-maloszewski99)]

Ok, I will track it. Thank you

diff --git a/debian/changelog b/debian/changelog
index 9e1b55d..ddaf5de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+resource-agents (1:4.7.0-1ubuntu7.2) jammy; urgency=medium
+
+  * d/p/pgsql-heartbeat-postgresql-issue-jammy.patch: walreceiver name
+    is changed to make the check for running wal receiver process
+    compatible with PostgreSQL >= 11 (LP: #2013084)
+
+ -- Michal Maloszewski <[e-mail]>  Wed, 03 May 2023 10:44:56 +0200
+
 resource-agents (1:4.7.0-1ubuntu7.1) jammy; urgency=medium
 
   * d/control: breaks/replaces for file reorg (LP: #1981598)
diff --git a/debian/patches/pgsql-heartbeat-postgresql-issue-jammy.patch b/debian/patches/pgsql-heartbeat-postgresql-issue-jammy.patch
new file mode 100644
index 0000000..8a0906a
--- /dev/null
+++ b/debian/patches/pgsql-heartbeat-postgresql-issue-jammy.patch
@@ -0,0 +1,29 @@
+From 214149d28142e4889e27f6637de8a8508c2f4d27 Mon Sep 17 00:00:00 2001
+From: Andreas Ntaflos <[e-mail]>
+Date: Thu, 24 Dec 2020 13:57:18 +0100
+Subject: [PATCH] pgsql: make wal receiver check compatible with PostgreSQL >=
+ 11
+
+In PostgreSQL 11 and later the wal receiver process is named
+"walreceiver" instead of "wal receiver process". This change makes the
+check for a running wal receiver process compatible with both variants.
+
+Origin: upstream, https://github.com/ClusterLabs/resource-agents/commit/214149d28142e4889e27f6637de8a8508c2f4d27
+Bug: https://github.com/ClusterLabs/resource-agents/issues/1551
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/resource-agents/+bug/2013084
+Last-Update: 2023-05-03
+---
+ heartbeat/pgsql | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/heartbeat/pgsql
++++ b/heartbeat/pgsql
+@@ -934,7 +934,7 @@
+     local pgsql_real_monitor_status=$1
+ 
+     PID=`head -n 1 $PIDFILE`
+-    receiver_parent_pids=`ps -ef | tr -s " " | grep "[w]al receiver process" | cut -d " " -f 3`
++    receiver_parent_pids=`ps -ef | tr -s " " | grep "[w]al\s*receiver" | cut -d " " -f 3`
+ 
+     if echo "$receiver_parent_pids" | grep -q -w "$PID" ; then
+         attrd_updater -n "$PGSQL_WAL_RECEIVER_STATUS_ATTR" -v "normal" -q
diff --git a/debian/patches/series b/debian/patches/series
index d4e9090..2f239b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ ocft-configs.patch
 gitignore.patch
 reproducible.patch
 var-run.patch
+pgsql-heartbeat-postgresql-issue-jammy.patch