Merge ~bryce/ubuntu/+source/resource-agents:ubuntu/focal-devel into ubuntu/+source/resource-agents:ubuntu/focal

[Bryce Harrington]

Backport of an upstream fix for a cpe-foundation escalated bug.

I've confirmed the fix is included in the groovy version of resource-agents, although the fix is a bit different there in that it relies on XML rather than raw text parsing. So, while the focus is the focal SRU, it probably wouldn't hurt to also check that groovy's resource-agent works properly with the test case.

The commit didn't have an upstream bug report associated with it. I skimmed recently closed bug reports but didn't spot one; #1527 sounded close but actually covers a different issue.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/resource-agents-sru-lp1900016-crm-mon-format
Bug: https://bugs.launchpad.net/ubuntu/groovy/+source/resource-agents/+bug/1900016

[Lucas Kanashiro (lucaskanashiro)]

Thanks for this Bryce. The packaging changes look good, I am going to try to reproduce the issue to confirm it is indeed fixed with this upstream patch (also update the Test Case section in the SRU bug description).

[Lucas Kanashiro (lucaskanashiro)]

Bryce I did some back and forth with the field engineer and I added a test case to the bug description. Hopefully it will be enough to the SRU.

review: Approve

[Bryce Harrington (bryce)]

Thanks, tagged, pushed and uploaded:

$ git push pkg upload/1%4.5.0-2ubuntu2.1
Enumerating objects: 16, done.
Counting objects: 100% (16/16), done.
Delta compression using up to 12 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 2.37 KiB | 303.00 KiB/s, done.
Total 11 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/resource-agents
 * [new tag] upload/1%4.5.0-2ubuntu2.1 -> upload/1%4.5.0-2ubuntu2.1

$ dput ubuntu resource-agents_4.5.0-2ubuntu2.1_source.changes
Checking signature on .changes
gpg: /home/bryce/pkg/ResourceAgents/sru-lp1900016-crm-mon-format/resource-agents_4.5.0-2ubuntu2.1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: /home/bryce/pkg/ResourceAgents/sru-lp1900016-crm-mon-format/resource-agents_4.5.0-2ubuntu2.1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading resource-agents_4.5.0-2ubuntu2.1.dsc: done.
  Uploading resource-agents_4.5.0-2ubuntu2.1.debian.tar.xz: done.
  Uploading resource-agents_4.5.0-2ubuntu2.1_source.buildinfo: done.
  Uploading resource-agents_4.5.0-2ubuntu2.1_source.changes: done.
Successfully uploaded packages.

[Bryce Harrington (bryce)]

This has migrated

diff --git a/debian/changelog b/debian/changelog
index befbee5..45fd7d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+resource-agents (1:4.5.0-2ubuntu2.1) focal; urgency=medium
+
+  * d/p/crm-mon-format.patch: Support newer crm_mon output formats.
+    The output of crm_mon -n1 changed to prefix node information with an
+    asterisk, resulting in the node_exist() function failing to show
+    correct information for nodes.  This updates the code to accept the new
+    node line format.
+    (LP: #1900016)
+
+ -- Bryce Harrington <[e-mail]>  Fri, 16 Oct 2020 00:11:13 +0000
+
 resource-agents (1:4.5.0-2ubuntu2) focal; urgency=medium
 
   * Remove bind9 autopkgtest not compatible with ubuntu (LP: #1872877)
diff --git a/debian/patches/crm-mon-format.patch b/debian/patches/crm-mon-format.patch
new file mode 100644
index 0000000..acd31f5
--- /dev/null
+++ b/debian/patches/crm-mon-format.patch
@@ -0,0 +1,45 @@
+From 2a56d5b27dc54f498231fb2bfd4d67c1883b9dea Mon Sep 17 00:00:00 2001
+From: yuskiida <[e-mail]>
+Date: Thu, 16 Apr 2020 22:40:41 +0900
+Subject: [PATCH] pgsql: support to crm_mon output for Pacemaker-2.0.3.
+
+Description: The output of crm_mon -n1 changed to prefix node
+ information with an asterisk, resulting in the node_exist() function
+ failing to show correct information for nodes.  This updates the code
+ to accept the new node line format.
+Origin: upstream, https://github.com/ClusterLabs/resource-agents/commit/2a56d5b2
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/resource-agents/+bug/1900016
+Reviewed-By: Bryce Harrington <[e-mail]>
+Applied-Upstream: 4.6.0, https://github.com/ClusterLabs/resource-agents/compare/v4.5.0...v4.6.0rc1
+
+---
+ heartbeat/pgsql | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/heartbeat/pgsql b/heartbeat/pgsql
+index c98db3aab..8d67b3ca7 100755
+--- a/heartbeat/pgsql
++++ b/heartbeat/pgsql
+@@ -1040,7 +1040,7 @@ pgsql_replication_monitor() {
+ 
+     # I can't get master node name from $OCF_RESKEY_CRM_meta_notify_master_uname on monitor,
+     # so I will get master node name using crm_mon -n
+-    print_crm_mon | tr -d "\t" | tr -d " " | grep -q "^${RESOURCE_NAME}[(:].*[):].*Master"
++    print_crm_mon | tr -d "\t" | tr -d " " | grep -q -e "^${RESOURCE_NAME}[(:].*[):].*Master" -e "^\*${RESOURCE_NAME}[(:].*[):].*Master"
+     if [ $? -ne 0 ] ; then
+         # If I am Slave and Master is not exist
+         ocf_log info "Master does not exist."
+@@ -1815,11 +1815,11 @@ exec_with_retry() {
+ }
+ 
+ is_node_online() {
+-    print_crm_mon | tr '[A-Z]' '[a-z]' | grep -e "^node $1 " -e "^node $1:" | grep -q -v "offline"
++    print_crm_mon | tr '[A-Z]' '[a-z]' | grep -e "^node $1 " -e "^node $1:" -e "\* node $1:" | grep -q -v "offline"
+ }
+ 
+ node_exist() {
+-    print_crm_mon | tr '[A-Z]' '[a-z]' | grep -q "^node $1"
++    print_crm_mon | tr '[A-Z]' '[a-z]' | grep -q -e "^node $1" -e "\* node $1:"
+ }
+ 
+ check_binary2() {
diff --git a/debian/patches/series b/debian/patches/series
index d4e9090..dd4d847 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ ocft-configs.patch
 gitignore.patch
 reproducible.patch
 var-run.patch
+crm-mon-format.patch