Merge ~athos-ribeiro/ubuntu/+source/crmsh:merge-lp1958978-jammy into ubuntu/+source/crmsh:debian/sid

[Athos Ribeiro]

[Athos Ribeiro (athos-ribeiro)]

A PPA is available at https://launchpad.net/~athos-ribeiro/+archive/ubuntu/merge-crmsh-4.3.1-1-jammy/+packages

I ran the dep8 test suite locally, here is the test summary:

autopkgtest [16:09:03]: @@@@@@@@@@@@@@@@@@@@ summary
command1 PASS
command2 PASS
command3 PASS
utils.sh PASS
testsuite.sh PASS
pacemaker-basic-resource.sh PASS
pacemaker-node-status.sh PASS

[Sergio Durigan Junior (sergiodj)]

I'll take this one.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Athos.

It looks good. The only issue I found was the creation of the new release on d/changelog in order to add a delta. I tried explaining why this is not necessary and what you should do instead; feel free to ping if you want more clarification.

The package builds fine locally. autopkgtest is also passing, which is great. There are only two bugs filed against the package, and they're both being addressed by this MP.

I'm marking this MP as Needs Fixing because of the new release issue I mentioned above. Let me know when you address it and I will be happy to take another look.

Thanks.

review: Needs Fixing

[Athos Ribeiro (athos-ribeiro)]

Thanks for the review, Sergio.

I replied to the comment below and will follow up later with further changes.

[Sergio Durigan Junior (sergiodj)]

On Tuesday, January 25 2022, Athos Ribeiro wrote:

>> diff --git a/debian/changelog b/debian/changelog
>> index 6b672f6..52b5b8e 100644
>> --- a/debian/changelog
>> +++ b/debian/changelog
>> @@ -1,3 +1,32 @@
>> +crmsh (4.3.1-1ubuntu2) jammy; urgency=medium
>
> Thanks for the review, Sergio :)
>
> This is what I intended to do at first. Then I came across [1] and
> thought the idea there implied an additional release bump to separate
> the added changes from the merge process itself. I will address the
> issue and update [1] to make this idea clearer.
>
> [1] https://github.com/canonical/ubuntu-maintainers-handbook/blob/main/PackageMerging.md#check-existing-bug-entries

Hey,

Hm, yeah, maybe that text could be expanded a little bit. I assume you
got confused because of the "... make a new SRU style commit at the end
of the merge ..." part, is that correct? Although it is saying
something about a commit, I agree that it could actually explain that
the commit should eventually be part of the same changelog entry that
the merge will create.

It could also be said that having changelog entries for releases that
were never uploaded to the archive is a no-no on Debian/Ubuntu, but this
is unrelated to the UMH section at hand.

Cheers,

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

f64fc2c... by Athos Ribeiro on 2022-01-26

merge-changelogs

8cd126c... by Athos Ribeiro on 2022-01-26

reconstruct-changelog

e7463cd... by Athos Ribeiro on 2022-01-26

update-maintainer

[Athos Ribeiro (athos-ribeiro)]

I addressed the review comments and submitted a PR for the maintainers handbook at https://github.com/canonical/ubuntu-maintainers-handbook/pull/40

I also pushed the new package to a new PPA at

https://launchpad.net/~athos-ribeiro/+archive/ubuntu/merge-crmsh-lp1958978-jammy/+packages

and re-ran the dep8 test suite. Here is the test result summary:

autopkgtest [10:00:21]: @@@@@@@@@@@@@@@@@@@@ summary
command1 PASS
command2 PASS
command3 PASS
utils.sh PASS
testsuite.sh PASS
pacemaker-basic-resource.sh PASS
pacemaker-node-status.sh PASS

[Sergio Durigan Junior (sergiodj)]

Thanks, Athos. This LGTM now. I believe you don't need a sponsor for this, but let me know if you do :-).

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks Sergio!

I squashed the last changelog change into the changelog reconstruction commit as well :)

[Athos Ribeiro (athos-ribeiro)]

This has now migrated.

diff --git a/debian/changelog b/debian/changelog
index 6b672f6..f12de2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+crmsh (4.3.1-1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1958978). Remaining changes:
+    - d/t/pacemaker-node-status.sh: Use the output of "uname -n" instead
+      of "node1" as the pacemaker node name.
+    - d/p/0020-Use-crmsh-hb_report.patch: use the crmsh shipped hb_report script
+      when available (LP #1958247).
+      [ Adjusted for 4.3.1 upstream release. ]
+  * Dropped changes:
+    - d/p/0017-Fix-health-scripts-python-38-support.patch: remove deprecated
+      function usage (LP #1947022).
+      [ Included in Debian in 4.3.1-1. ]
+    - d/p/0018-Replace-crmd.patch: replace crmd calls with pacemaker-controld
+      (LP #1958241).
+      [ Included in Debian in 4.3.1-1. ]
+    - d/t/testsuite.sh: set timezone for time conversion tests (LP #1958243).
+      [ Included in Debian in 4.3.1-1. ]
+    - d/p/0019-Add-hb_report-dpkg-support.patch: Add dpkg support to hb_report
+      (LP #1958246).
+      [ Included in Debian in 4.3.1-1. ]
+  * Added changes:
+    - d/p/0021-Support-python-310.patch: support Python 3.10 (LP: #1958393).
+
+ -- Athos Ribeiro <[e-mail]>  Wed, 26 Jan 2022 09:27:26 -0300
+
 crmsh (4.3.1-1) unstable; urgency=medium
 
   [ Valentin Vidic ]
@@ -18,6 +43,29 @@ crmsh (4.3.1-1) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Wed, 19 Jan 2022 21:13:36 +0100
 
+crmsh (4.2.1-3ubuntu2) jammy; urgency=medium
+
+  * New changes:
+    - d/p/0017-Fix-health-scripts-python-38-support.patch: remove deprecated
+      function usage (LP: #1947022).
+    - d/p/0018-Replace-crmd.patch: replace crmd calls with pacemaker-controld
+      (LP: #1958241).
+    - d/t/testsuite.sh: set timezone for time conversion tests (LP: #1958243).
+    - d/p/0019-Add-hb_report-dpkg-support.patch: add dpkg support to hb_report
+      (LP: #1958246).
+    - d/p/0020-Use-crmsh-hb_report.patch: use the crmsh shipped hb_report script
+      when available (LP: #1958247).
+
+ -- Athos Ribeiro <[e-mail]>  Fri, 07 Jan 2022 10:14:32 -0300
+
+crmsh (4.2.1-3ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1946853). Remaining changes:
+    - d/t/pacemaker-node-status.sh: Use the output of "uname -n" instead
+      of "node1" as the pacemaker node name.
+
+ -- Utkarsh Gupta <[e-mail]>  Mon, 06 Dec 2021 17:46:48 +0530
+
 crmsh (4.2.1-3) unstable; urgency=medium
 
   * Team upload
@@ -27,6 +75,24 @@ crmsh (4.2.1-3) unstable; urgency=medium
 
  -- Ferenc Wágner <[e-mail]>  Sat, 30 Oct 2021 15:37:37 +0200
 
+crmsh (4.2.1-2ubuntu1) impish; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/t/pacemaker-node-status.sh: Use the output of "uname -n" instead
+      of "node1" as the pacemaker node name.
+  * Dropped:
+    - Upstream patches with post release fixes
+      + [997f62d6] Fix: hb_report: disable dump all tasks stack into dmesg
+      + [cce28254] Fix: crmsh.spec: using mktemp to create tmp file
+      + [e098387e] Fix: bootstrap: use csync2 '-f' option correctly
+      + [669f13b5] Fix: bootstrap: Change condition to add stonith-sbd resource
+      + [ca1f0a7f] Fix: ui_resource: refresh <Tab> should complete resource
+        first
+      + [78ce77e4] Low: hb_report: Fix collecting of binary data
+      [Applied by upstream in version 4.2.1]
+
+ -- Lucas Kanashiro <[e-mail]>  Fri, 23 Jul 2021 09:38:52 -0300
+
 crmsh (4.2.1-2) unstable; urgency=medium
 
   * d/patches: include fix for CVE-2020-35459 (Closes: #985376)
@@ -44,6 +110,25 @@ crmsh (4.2.1-1) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Wed, 03 Feb 2021 22:05:33 +0100
 
+crmsh (4.2.0-4ubuntu2) impish; urgency=medium
+
+  * d/t/pacemaker-node-status.sh: Use the output of "uname -n" instead
+    of "node1" as the pacemaker node name.
+
+ -- Sergio Durigan Junior <[e-mail]>  Wed, 07 Jul 2021 16:44:57 -0400
+
+crmsh (4.2.0-4ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - [997f62d6] Fix: hb_report: disable dump all tasks stack into dmesg
+    - [cce28254] Fix: crmsh.spec: using mktemp to create tmp file
+    - [e098387e] Fix: bootstrap: use csync2 '-f' option correctly
+    - [669f13b5] Fix: bootstrap: Change condition to add stonith-sbd resource
+    - [ca1f0a7f] Fix: ui_resource: refresh <Tab> should complete resource first
+    - [78ce77e4] Low: hb_report: Fix collecting of binary data
+
+ -- Matthias Klose <[e-mail]>  Sun, 29 Nov 2020 13:55:19 +0100
+
 crmsh (4.2.0-4) unstable; urgency=medium
 
   * d/patches: fix flaky autopkgtest (Closes: #972619)
@@ -52,6 +137,18 @@ crmsh (4.2.0-4) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Wed, 21 Oct 2020 20:42:26 +0200
 
+crmsh (4.2.0-3ubuntu1) groovy; urgency=medium
+
+  * Fixes before release: (LP: #1895728)
+    - [997f62d6] Fix: hb_report: disable dump all tasks stack into dmesg
+    - [cce28254] Fix: crmsh.spec: using mktemp to create tmp file
+    - [e098387e] Fix: bootstrap: use csync2 '-f' option correctly
+    - [669f13b5] Fix: bootstrap: Change condition to add stonith-sbd resource
+    - [ca1f0a7f] Fix: ui_resource: refresh <Tab> should complete resource first
+    - [78ce77e4] Low: hb_report: Fix collecting of binary data
+
+ -- Rafael David Tinoco <[e-mail]>  Wed, 16 Sep 2020 03:41:38 +0000
+
 crmsh (4.2.0-3) unstable; urgency=medium
 
   [ Debian Janitor ]
diff --git a/debian/control b/debian/control
index 72403ca..c465a71 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: crmsh
 Section: admin
 Priority: optional
-Maintainer: Debian HA Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian HA Maintainers <[e-mail]>
 Uploaders:
  Richard B Winters <[e-mail]>,
  Adrian Vondendriesch <[e-mail]>,
diff --git a/debian/patches/0020-Use-crmsh-hb_report.patch b/debian/patches/0020-Use-crmsh-hb_report.patch
new file mode 100644
index 0000000..62e063f
--- /dev/null
+++ b/debian/patches/0020-Use-crmsh-hb_report.patch
@@ -0,0 +1,32 @@
+Description: Use the crmsh provided hb_report binary
+  Otherwise, this calls will default to use the deprecated cluster-glue
+  hb_report available in the system path.
+  This change was performed upstream as part of
+  https://github.com/ClusterLabs/crmsh/commit/bfb14d0b7fbb3dd027699367dc75f5af74a9fac3.
+  Since until version 4.3.1, crmsh still relies on the cluster-glue hb_report,
+  this patch does fall back to such binary in case the crmsh binary is not
+  available.
+Author: Athos Ribeiro <[e-mail]>
+Forwarded: not-needed
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+bug/1958247
+Last-Update: 2022-01-14
+
+--- a/hb_report/utillib.py
++++ b/hb_report/utillib.py
+@@ -1540,13 +1540,14 @@
+ 
+ 
+ def start_slave_collector(node, arg_str):
++    hb_report ='$(ls /usr/share/crmsh/hb_report/hb_report || echo /usr/sbin/hb_report)'
+     if node == constants.WE:
+-        cmd = r"/usr/sbin/hb_report __slave".format(os.getcwd())
++        cmd = r"{} __slave".format(hb_report, os.getcwd())
+         for item in arg_str.split():
+             cmd += " {}".format(str(item))
+         _, out = crmutils.get_stdout(cmd)
+     else:
+-        cmd = r'ssh {} {} "/usr/sbin/hb_report __slave"'.format(constants.SSH_OPTS, node, os.getcwd())
++        cmd = r'ssh {} {} "{} __slave"'.format(constants.SSH_OPTS, node, hb_report, os.getcwd())
+         for item in arg_str.split():
+             cmd += " {}".format(str(item))
+         code, out, err = crmutils.get_stdout_stderr(cmd)
diff --git a/debian/patches/0021-Support-python-310.patch b/debian/patches/0021-Support-python-310.patch
new file mode 100644
index 0000000..b86241d
--- /dev/null
+++ b/debian/patches/0021-Support-python-310.patch
@@ -0,0 +1,53 @@
+From c1356d64086d2e3f9d113f346a14e6dff1c2acb0 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[e-mail]>
+Date: Tue, 26 Oct 2021 14:01:09 +0800
+Subject: [PATCH] orderedset.py: fix deprecation on collections.MutableSet
+
+Python 3.10 removes the deprecated aliases to collections abstract
+base clases [1]. Using 'collections.abc.MutableSet' instead of
+'collections.MutableSet'
+
+[1]: https://bugs.python.org/issue37324
+
+Fixes:
+$ crm
+Traceback (most recent call last):
+  File "/usr/bin/crm", line 29, in <module>
+    from crmsh import main
+  File "/usr/lib64/python3.10/site-packages/crmsh/main.py", line 18, in <module>
+    from . import ui_root
+  File "/usr/lib64/python3.10/site-packages/crmsh/ui_root.py", line 23, in <module>
+    from . import ui_cib
+  File "/usr/lib64/python3.10/site-packages/crmsh/ui_cib.py", line 16, in <module>
+    from .cibconfig import cib_factory
+  File "/usr/lib64/python3.10/site-packages/crmsh/cibconfig.py", line 23, in <module>
+    from . import orderedset
+  File "/usr/lib64/python3.10/site-packages/crmsh/orderedset.py", line 29, in <module>
+    class OrderedSet(collections.MutableSet):
+AttributeError: module 'collections' has no attribute 'MutableSet'
+
+Signed-off-by: Yi Zhao <[e-mail]>
+
+Origin: upstream, https://github.com/ClusterLabs/crmsh/commit/c1356d64086d2e3f9d113f346a14e6dff1c2acb0
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+bug/1958393
+Last-Update: 2022-01-19
+---
+ crmsh/orderedset.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/crmsh/orderedset.py b/crmsh/orderedset.py
+index 21ec480c..27233289 100644
+--- a/crmsh/orderedset.py
++++ b/crmsh/orderedset.py
+@@ -26,7 +26,7 @@ import collections
+ KEY, PREV, NEXT = list(range(3))
+ 
+ 
+-class OrderedSet(collections.MutableSet):
++class OrderedSet(collections.abc.MutableSet):
+ 
+     def __init__(self, iterable=None):
+         self.end = end = []
+-- 
+2.33.1
+
diff --git a/debian/patches/series b/debian/patches/series
index a6ffa87..f07fd29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,5 @@
 0017-Fix-health-scripts-python-38-support.patch
 0018-Replace-crmd.patch
 0019-Add-hb_report-dpkg-support.patch
+0020-Use-crmsh-hb_report.patch
+0021-Support-python-310.patch
diff --git a/debian/tests/pacemaker-node-status.sh b/debian/tests/pacemaker-node-status.sh
index 229a678..1453cff 100755
--- a/debian/tests/pacemaker-node-status.sh
+++ b/debian/tests/pacemaker-node-status.sh
@@ -20,7 +20,7 @@ service pacemaker start
 sleep $DAEMON_TIMEOUT
 
 POS="$(corosync-cmapctl -q -g nodelist.local_node_pos)"
-NODE="$(corosync-cmapctl -q -g nodelist.node.$POS.name)"
+NODE="$(uname -n)"
 
 #
 # online