Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2022-09-08 14:23:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh"
Thu Sep 8 14:23:39 2022 rev:256 rq:1001862 version:4.4.1+20220908.d668787c
Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-09-02
21:57:06.096377604 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2083/crmsh.changes 2022-09-08
14:24:07.814734857 +0200
@@ -1,0 +2,21 @@
+Thu Sep 08 06:30:59 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220908.d668787c:
+ * Dev: add remote_auth to known stages of cluster init
+ * Dev: add unit tests for SBDTimeout.initialize_timeout
+ * Dev: refactor timeout caculation for sbd
+
+-------------------------------------------------------------------
+Thu Sep 08 02:00:33 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220908.88a9f0c9:
+ * Dev: GH-workflows: Add a general check to check if data-manifest changed
+
+-------------------------------------------------------------------
+Mon Sep 05 14:51:59 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220905.311a0a0d:
+ * Dev: testcases: adjust origin testcases based on previous changes
+ * Dev: data-manifest: Update content of data-manifest since #1022 added new
files
+
+-------------------------------------------------------------------
Old:
----
crmsh-4.4.1+20220902.dceb5b92.tar.bz2
New:
----
crmsh-4.4.1+20220908.d668787c.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.qOFHIg/_old 2022-09-08 14:24:08.378736159 +0200
+++ /var/tmp/diff_new_pack.qOFHIg/_new 2022-09-08 14:24:08.386736177 +0200
@@ -36,7 +36,7 @@
Summary: High Availability cluster command-line interface
License: GPL-2.0-or-later
Group: %{pkg_group}
-Version: 4.4.1+20220902.dceb5b92
+Version: 4.4.1+20220908.d668787c
Release: 0
URL: http://crmsh.github.io
Source0: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.qOFHIg/_old 2022-09-08 14:24:08.470736371 +0200
+++ /var/tmp/diff_new_pack.qOFHIg/_new 2022-09-08 14:24:08.474736380 +0200
@@ -9,7 +9,7 @@
</service>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/crmsh.git</param>
- <param
name="changesrevision">051a68726275e7f61ba85da01354fd4536ac746f</param>
+ <param
name="changesrevision">d668787cd5b5d0c5339e6c993d2a68ee2d2e02fb</param>
</service>
</servicedata>
(No newline at EOF)
++++++ crmsh-4.4.1+20220902.dceb5b92.tar.bz2 ->
crmsh-4.4.1+20220908.d668787c.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20220902.dceb5b92/.github/workflows/crmsh-ci.yml
new/crmsh-4.4.1+20220908.d668787c/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.4.1+20220902.dceb5b92/.github/workflows/crmsh-ci.yml
2022-09-02 08:33:58.000000000 +0200
+++ new/crmsh-4.4.1+20220908.d668787c/.github/workflows/crmsh-ci.yml
2022-09-08 08:15:31.000000000 +0200
@@ -16,6 +16,21 @@
TARGET_PROJECT: ${{ secrets.TARGET_PROJECT }}
jobs:
+ general_check:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: check data-manifest
+ run: |
+ ./update-data-manifest.sh
+ output=`git --no-pager diff data-manifest`
+ [[ -z $output ]] || {
+ echo "$output"
+ echo "A new version of data-manifest is needed."
+ echo "Please run ./update-data-manifest.sh && git add
./data-manifest in your local environment and push the code again."
+ exit 1
+ }
+
unit_test:
runs-on: ubuntu-latest
strategy:
@@ -179,7 +194,8 @@
$DOCKER_SCRIPT 14
delivery:
- needs: [unit_test,
+ needs: [general_check,
+ unit_test,
functional_test_crm_report_bugs,
functional_test_bootstrap_bugs,
functional_test_bootstrap_common,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220902.dceb5b92/crmsh/bootstrap.py
new/crmsh-4.4.1+20220908.d668787c/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20220902.dceb5b92/crmsh/bootstrap.py 2022-09-02
08:33:58.000000000 +0200
+++ new/crmsh-4.4.1+20220908.d668787c/crmsh/bootstrap.py 2022-09-08
08:15:31.000000000 +0200
@@ -66,7 +66,7 @@
"/etc/drbd.conf", "/etc/drbd.d", "/etc/ha.d/ldirectord.cf",
"/etc/lvm/lvm.conf", "/etc/multipath.conf",
"/etc/samba/smb.conf", SYSCONFIG_NFS, SYSCONFIG_PCMK, SYSCONFIG_SBD,
PCMK_REMOTE_AUTH, WATCHDOG_CFG,
PROFILES_FILE, CRM_CFG, SBD_SYSTEMD_DELAY_START_DIR)
-INIT_STAGES = ("ssh", "ssh_remote", "csync2", "csync2_remote", "corosync",
"sbd", "cluster", "ocfs2", "admin", "qdevice")
+INIT_STAGES = ("ssh", "ssh_remote", "csync2", "csync2_remote", "corosync",
"remote_auth", "sbd", "cluster", "ocfs2", "admin", "qdevice")
class Context(object):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220902.dceb5b92/crmsh/sbd.py
new/crmsh-4.4.1+20220908.d668787c/crmsh/sbd.py
--- old/crmsh-4.4.1+20220902.dceb5b92/crmsh/sbd.py 2022-09-02
08:33:58.000000000 +0200
+++ new/crmsh-4.4.1+20220908.d668787c/crmsh/sbd.py 2022-09-08
08:15:31.000000000 +0200
@@ -37,7 +37,14 @@
self.removing = removing
self.two_node_without_qdevice = False
- def set_sbd_watchdog_timeout(self):
+ def initialize_timeout(self):
+ self._set_sbd_watchdog_timeout()
+ if self.context.diskless_sbd:
+ self._adjust_sbd_watchdog_timeout_with_diskless_and_qdevice()
+ else:
+ self._set_sbd_msgwait()
+
+ def _set_sbd_watchdog_timeout(self):
"""
Set sbd_watchdog_timeout from profiles.yml if exists
Then adjust it if in s390 environment
@@ -48,7 +55,7 @@
logger.warning("sbd_watchdog_timeout is set to %d for s390, it was
%d", self.SBD_WATCHDOG_TIMEOUT_DEFAULT_S390, self.sbd_watchdog_timeout)
self.sbd_watchdog_timeout = self.SBD_WATCHDOG_TIMEOUT_DEFAULT_S390
- def set_sbd_msgwait(self):
+ def _set_sbd_msgwait(self):
"""
Set sbd msgwait from profiles.yml if exists
Default is 2 * sbd_watchdog_timeout
@@ -62,7 +69,7 @@
sbd_msgwait = sbd_msgwait_default
self.sbd_msgwait = sbd_msgwait
- def adjust_sbd_watchdog_timeout_with_diskless_and_qdevice(self):
+ def _adjust_sbd_watchdog_timeout_with_diskless_and_qdevice(self):
"""
When using diskless SBD with Qdevice, adjust value of
sbd_watchdog_timeout
"""
@@ -401,12 +408,10 @@
if msg:
logger.info(msg)
self.timeout_inst = SBDTimeout(self._context)
- self.timeout_inst.set_sbd_watchdog_timeout()
+ self.timeout_inst.initialize_timeout()
if self.diskless_sbd:
-
self.timeout_inst.adjust_sbd_watchdog_timeout_with_diskless_and_qdevice()
return
- self.timeout_inst.set_sbd_msgwait()
opt = "-4 {} -1 {}".format(self.timeout_inst.sbd_msgwait,
self.timeout_inst.sbd_watchdog_timeout)
for dev in self._sbd_devices:
@@ -524,6 +529,9 @@
utils.set_property(stonith_enabled="true")
# disk-less sbd
else:
+ if self.timeout_inst is None:
+ self.timeout_inst = SBDTimeout(self._context)
+ self.timeout_inst.initialize_timeout()
cmd =
self.DISKLESS_CRM_CMD.format(self.timeout_inst.stonith_watchdog_timeout,
constants.STONITH_TIMEOUT_DEFAULT)
utils.get_stdout_or_raise_error(cmd)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220902.dceb5b92/data-manifest
new/crmsh-4.4.1+20220908.d668787c/data-manifest
--- old/crmsh-4.4.1+20220902.dceb5b92/data-manifest 2022-09-02
08:33:58.000000000 +0200
+++ new/crmsh-4.4.1+20220908.d668787c/data-manifest 2022-09-08
08:15:31.000000000 +0200
@@ -4,6 +4,8 @@
scripts/check-uptime/report.py
scripts/clvm/main.yml
scripts/clvm-vg/main.yml
+scripts/cryptctl/main.yml
+scripts/cryptctl/README.md
scripts/database/main.yml
scripts/db2-hadr/main.yml
scripts/db2/main.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20220902.dceb5b92/test/testcases/scripts.exp
new/crmsh-4.4.1+20220908.d668787c/test/testcases/scripts.exp
--- old/crmsh-4.4.1+20220902.dceb5b92/test/testcases/scripts.exp
2022-09-02 08:33:58.000000000 +0200
+++ new/crmsh-4.4.1+20220908.d668787c/test/testcases/scripts.exp
2022-09-08 08:15:31.000000000 +0200
@@ -5,6 +5,7 @@
.EXT crm_resource --show-metadata ocf:heartbeat:IPaddr2
.EXT crm_resource --show-metadata ocf:heartbeat:Filesystem
.EXT crm_resource --show-metadata ocf:heartbeat:mysql
+.EXT crm_resource --show-metadata systemd:cryptctl-server
.EXT crm_resource --show-metadata ocf:heartbeat:db2
.EXT crm_resource --show-metadata ocf:heartbeat:exportfs
.EXT crm_resource --show-metadata systemd:haproxy
@@ -62,6 +63,10 @@
sbd SBD, Shared storage based fencing
vmware Fencing using vCenter / ESX Server
+System/management:
+
+cryptctl A utility for setting up LUKS-based disk encryption
+
.INP: list all
Basic:
@@ -123,10 +128,15 @@
sbd SBD, Shared storage based fencing
vmware Fencing using vCenter / ESX Server
+System/management:
+
+cryptctl A utility for setting up LUKS-based disk encryption
+
.INP: list names
apache
clvm
clvm-vg
+cryptctl
database
db2
db2-hadr
@@ -158,6 +168,7 @@
check-uptime
clvm
clvm-vg
+cryptctl
database
db2
db2-hadr
@@ -195,6 +206,7 @@
check-uptime
clvm
clvm-vg
+cryptctl
database
db2
db2-hadr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20220902.dceb5b92/test/unittests/test_sbd.py
new/crmsh-4.4.1+20220908.d668787c/test/unittests/test_sbd.py
--- old/crmsh-4.4.1+20220902.dceb5b92/test/unittests/test_sbd.py
2022-09-02 08:33:58.000000000 +0200
+++ new/crmsh-4.4.1+20220908.d668787c/test/unittests/test_sbd.py
2022-09-08 08:15:31.000000000 +0200
@@ -42,15 +42,24 @@
Global tearDown.
"""
+ def test_initialize_timeout(self):
+ self.sbd_timeout_inst._set_sbd_watchdog_timeout = mock.Mock()
+ self.sbd_timeout_inst._set_sbd_msgwait = mock.Mock()
+
self.sbd_timeout_inst._adjust_sbd_watchdog_timeout_with_diskless_and_qdevice =
mock.Mock()
+ self.sbd_timeout_inst.initialize_timeout()
+ self.sbd_timeout_inst._set_sbd_watchdog_timeout.assert_called_once()
+ self.sbd_timeout_inst._set_sbd_msgwait.assert_not_called()
+
self.sbd_timeout_inst._adjust_sbd_watchdog_timeout_with_diskless_and_qdevice.assert_called_once()
+
@mock.patch('logging.Logger.warning')
def test_set_sbd_watchdog_timeout(self, mock_warn):
- self.sbd_timeout_inst.set_sbd_watchdog_timeout()
+ self.sbd_timeout_inst._set_sbd_watchdog_timeout()
mock_warn.assert_called_once_with("sbd_watchdog_timeout is set to %d
for s390, it was %d", sbd.SBDTimeout.SBD_WATCHDOG_TIMEOUT_DEFAULT_S390, 5)
@mock.patch('logging.Logger.warning')
def test_set_sbd_msgwait(self, mock_warn):
self.sbd_timeout_inst.sbd_watchdog_timeout = 15
- self.sbd_timeout_inst.set_sbd_msgwait()
+ self.sbd_timeout_inst._set_sbd_msgwait()
mock_warn.assert_called_once_with("sbd msgwait is set to %d, it was
%d", 30, 10)
@mock.patch('logging.Logger.warning')
@@ -62,7 +71,7 @@
mock_is_active.return_value = True
mock_get_sync.return_value = 15
self.sbd_timeout_inst.sbd_watchdog_timeout = 5
-
self.sbd_timeout_inst.adjust_sbd_watchdog_timeout_with_diskless_and_qdevice()
+
self.sbd_timeout_inst._adjust_sbd_watchdog_timeout_with_diskless_and_qdevice()
mock_warn.assert_called_once_with("sbd_watchdog_timeout is set to 20
for qdevice, it was 5")
@mock.patch('logging.Logger.warning')
@@ -70,7 +79,7 @@
def test_adjust_sbd_watchdog_timeout_with_diskless_and_qdevice_all(self,
mock_is_configured, mock_warn):
mock_is_configured.return_value = False
self.sbd_timeout_inst.sbd_watchdog_timeout = 5
-
self.sbd_timeout_inst.adjust_sbd_watchdog_timeout_with_diskless_and_qdevice()
+
self.sbd_timeout_inst._adjust_sbd_watchdog_timeout_with_diskless_and_qdevice()
mock_warn.assert_called_once_with("sbd_watchdog_timeout is set to 35
for qdevice, it was 5")
@mock.patch('crmsh.utils.get_stdout_or_raise_error')
@@ -463,12 +472,10 @@
def test_initialize_sbd_return(self, mock_info, mock_sbd_timeout):
mock_inst = mock.Mock()
mock_sbd_timeout.return_value = mock_inst
- mock_inst.set_sbd_watchdog_timeout = mock.Mock()
- mock_inst.adjust_sbd_watchdog_timeout_with_diskless_and_qdevice =
mock.Mock()
self.sbd_inst_diskless._context = mock.Mock(profiles_dict={})
self.sbd_inst_diskless._initialize_sbd()
mock_info.assert_called_once_with("Configuring diskless SBD")
-
mock_inst.adjust_sbd_watchdog_timeout_with_diskless_and_qdevice.assert_called_once_with()
+ mock_inst.initialize_timeout.assert_called_once_with()
@mock.patch('crmsh.utils.fatal')
@mock.patch('crmsh.bootstrap.invoke')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20220902.dceb5b92/update-data-manifest.sh
new/crmsh-4.4.1+20220908.d668787c/update-data-manifest.sh
--- old/crmsh-4.4.1+20220902.dceb5b92/update-data-manifest.sh 2022-09-02
08:33:58.000000000 +0200
+++ new/crmsh-4.4.1+20220908.d668787c/update-data-manifest.sh 2022-09-08
08:15:31.000000000 +0200
@@ -20,7 +20,7 @@
target=data-manifest
[ -f $target ] && (printf "Removing $target..."; rm $target)
printf "Generating $target..."
-cat <<EOF | sort > $target
+cat <<EOF | sort -df > $target
version
$(git ls-files scripts templates utils test)
EOF
