Merge ~athos-ribeiro/ubuntu/+source/crmsh:fix-crmadmin-output into ubuntu/+source/crmsh:ubuntu/kinetic-devel

[Athos Ribeiro]

SRU proposed in LP: #1972730.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp1972730-crmsh/+packages

DEP8 test suite local run result summary:

autopkgtest [12:21:24]: @@@@@@@@@@@@@@@@@@@@ summary
command1 PASS
command2 PASS
command3 PASS
utils.sh PASS
testsuite.sh PASS
pacemaker-basic-resource.sh PASS
pacemaker-node-status.sh PASS
pacemaker-cluster-init.sh PASS

[Bryce Harrington (bryce)]

Just one issue needing fixed: the version number should be 4.4.0-1ubuntu1.1.

I triggered the autopkgtests, and they passed no prob:

    04.04.23 01:29:56 Log 🗒️ ✅ Triggers: crmsh/4.4.0-1ubuntu2~ppa1
    05.04.23 04:07:33 Log 🗒️ ✅ Triggers: crmsh/4.4.0-1ubuntu2~ppa1
  crmsh @ arm64:
    05.04.23 04:26:31 Log 🗒️ ✅ Triggers: crmsh/4.4.0-1ubuntu2~ppa1
  crmsh @ armhf:
    05.04.23 04:34:04 Log 🗒️ ✅ Triggers: crmsh/4.4.0-1ubuntu2~ppa1
  crmsh @ ppc64el:
    05.04.23 04:01:46 Log 🗒️ ✅ Triggers: crmsh/4.4.0-1ubuntu2~ppa1
  crmsh @ s390x:
    05.04.23 04:39:47 Log 🗒️ ✅ Triggers: crmsh/4.4.0-1ubuntu2~ppa1

Oddly, I also ran the autopkgtest locally, but it hit a failure:

autopkgtest [04:01:13]: @@@@@@@@@@@@@@@@@@@@ summary
command1 PASS
command2 PASS
command3 PASS
utils.sh FAIL non-zero exit status 1
testsuite.sh PASS
pacemaker-basic-resource.sh PASS
pacemaker-node-status.sh PASS
pacemaker-cluster-init.sh PASS

autopkgtest [03:54:16]: test utils.sh: [-----------------------
+ export LC_ALL=C
+ PKG=vim
+ dpkg --purge vim
dpkg: dependency problems prevent removal of vim:
 ubuntu-server depends on vim.

dpkg: error processing package vim (--purge):
 dependency problems - not removing
Errors were encountered while processing:
 vim
autopkgtest [03:54:16]: test utils.sh: -----------------------]
autopkgtest [03:54:17]: test utils.sh: - - - - - - - - - - results - - - - - - - - - -
utils.sh FAIL non-zero exit status 1

(I guess since I was running it in a non-ephemeral container, dpkg refused to let vim be purged. I guess that's ok, just odd.)

The patch itself LGTM, and matches what was landed upstream.

So, other than the version number the packaging all LGTM, and once that is fixed count this as approved.

### SRU text review ###

  - [impact] -> [Impact]

  - "is necessary" -> "it is necessary"

  - "in maintenance mode" -> "into maintenance mode"

I would not use paste.ubuntu.com for providing sample configs. Instead, save that to a file and upload it to the bug report as an attachment, then refer to it by the comment id# or a direct link.

I don't have juju installed on my desktop, so to make the SRU test case more paint by numbers it might be good to also include the install & setup steps. (Or, is there a simpler way to reproduce the failing without involving juju?)

I feel like there could be more to be said in [Where problems could occur] in relation to how crmadmin's output could vary, but I don't have actual suggestions there. For example, maybe an example of what the crmadmin stdout used to look like, how that has caused problems, or how the format has changed.

review: Needs Fixing

[Athos Ribeiro (athos-ribeiro)]

Thanks, Bryce!

> So, other than the version number the packaging all LGTM, and once that is fixed count this as approved.

In that case, I fixed it and uploaded the package.

> ### SRU text review ###

Thanks!

I addressed the minor issues (grammar and style) and pinged Felipe, who was originally driving this SRU, to check if he'd like to address the bigger ones (juju test plan and "where problems could occur")

[Bryce Harrington (bryce)]

Sounds good!

review: Approve

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

Approvers: athos-ribeiro, bryce
Uploaders: athos-ribeiro, bryce
MP auto-approved

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 7a719dc..c5b81d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+crmsh (4.4.0-1ubuntu1.1) kinetic; urgency=medium
+
+  * d/p/lp1972730.patch: Handle the output of 'crmadmin -S' correctly.
+    (LP: #1972730)
+
+ -- Athos Ribeiro <[e-mail]>  Mon, 03 Apr 2023 21:06:53 -0300
+
 crmsh (4.4.0-1ubuntu1) kinetic; urgency=medium
 
   * Merge with Debian unstable (LP: #1971271, #1972730). Remaining changes:
diff --git a/debian/patches/lp1972730.patch b/debian/patches/lp1972730.patch
new file mode 100644
index 0000000..d8a9a58
--- /dev/null
+++ b/debian/patches/lp1972730.patch
@@ -0,0 +1,35 @@
+From f83aa41185dbc71a25a3def39d42356e503b1f96 Mon Sep 17 00:00:00 2001
+From: liangxin1300 <[e-mail]>
+Date: Wed, 11 May 2022 11:09:28 +0800
+Subject: [PATCH] Fix: utils: wait4dc: Make change since output of 'crmadmin -S' changed(bsc#1199412)
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/crmsh/+bug/1972730
+Origin: upstream, https://github.com/ClusterLabs/crmsh/commit/50fe231d9ed188c8727d80bd7fb09d362c03ec32
+Last-Update: 2023-04-03
+---
+ crmsh/utils.py | 11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/crmsh/utils.py b/crmsh/utils.py
+index 9f2603a12..9ebce28fc 100644
+--- a/crmsh/utils.py
++++ b/crmsh/utils.py
+@@ -895,15 +895,10 @@ def wait4dc(what="", show_progress=True):
+             return False
+         cmd = "crmadmin -S %s" % dc
+         rc, s = get_stdout(add_sudo(cmd))
+-        if not s.startswith("Status"):
+-            logger.warning("%s unexpected output: %s (exit code: %d)", cmd, s, rc)
+-            return False
+-        try:
+-            dc_status = s.split()[-2]
+-        except:
+-            logger.warning("%s unexpected output: %s", cmd, s)
++        if rc != 0:
++            logger.error("Exit code of command {} is {}".format(cmd, rc))
+             return False
+-        if dc_status == "S_IDLE":
++        if re.search("S_IDLE.*ok", s):
+             if output_started:
+                 sys.stderr.write(" done\n")
+             return True
diff --git a/debian/patches/series b/debian/patches/series
index 761b4a9..0f8a51d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 0015-Fix-testsuite-errors.patch
 0016-Fix-python2-calls.patch
 0017-Fix-profiles-adoc.patch
+lp1972730.patch