Hello community, here is the log from the commit of package sbd for openSUSE:Leap:15.2 checked in at 2020-01-30 06:08:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/sbd (Old) and /work/SRC/openSUSE:Leap:15.2/.sbd.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbd" Thu Jan 30 06:08:40 2020 rev:37 rq:767801 version:1.4.1+20200113.4b617a1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/sbd/sbd.changes 2020-01-15 16:01:14.587856223 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.sbd.new.26092/sbd.changes 2020-01-30 06:09:03.406486402 +0100 @@ -1,0 +2,12 @@ +Mon Jan 13 15:30:49 UTC 2020 - Yan Gao <y...@suse.com> + +- Update to version 1.4.1+20200113.4b617a1: +- agent: correctly compare string values when calculating timeout (bsc#1148236) + +------------------------------------------------------------------- +Mon Jan 13 15:11:24 UTC 2020 - Yan Gao <y...@suse.com> + +- Update to version sbd-1.4.1+20191119.25fce8a (v1.4.1): +- regressions.sh: relaxed timeouts for tests under load + +------------------------------------------------------------------- @@ -161 +173 @@ -- Fix: systemd: make pacemaker & dlm wait for sbd-start to complete +- Fix: systemd: make pacemaker & dlm wait for sbd-start to complete (bsc#1108393) @@ -216 +228 @@ -- Fix node name parameter in manpage +- Fix node name parameter in manpage (bsc#963674) Old: ---- sbd-1.4.0+20191029.695f9ca.tar.xz New: ---- sbd-1.4.1+20200113.4b617a1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbd.spec ++++++ --- /var/tmp/diff_new_pack.fAeM3K/_old 2020-01-30 06:09:03.762486601 +0100 +++ /var/tmp/diff_new_pack.fAeM3K/_new 2020-01-30 06:09:03.762486601 +0100 @@ -1,7 +1,7 @@ # # spec file for package sbd # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 Lars Marowsky-Bree # # All modifications and additions to the file contributed by third parties @@ -23,7 +23,7 @@ %endif Name: sbd -Version: 1.4.0+20191029.695f9ca +Version: 1.4.1+20200113.4b617a1 Release: 0 Summary: Storage-based death License: GPL-2.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.fAeM3K/_old 2020-01-30 06:09:03.786486614 +0100 +++ /var/tmp/diff_new_pack.fAeM3K/_new 2020-01-30 06:09:03.786486614 +0100 @@ -4,7 +4,7 @@ <param name="exclude">.git</param> <param name="url">https://github.com/ClusterLabs/sbd.git</param> <param name="revision">master</param> - <param name="versionformat">1.4.0+%cd.%h</param> + <param name="versionformat">1.4.1+%cd.%h</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.fAeM3K/_old 2020-01-30 06:09:03.814486630 +0100 +++ /var/tmp/diff_new_pack.fAeM3K/_new 2020-01-30 06:09:03.814486630 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ClusterLabs/sbd.git</param> - <param name="changesrevision">c4dc05841157dd42496d3643617c31383410e51f</param> + <param name="changesrevision">b6003594e7b71fbb0c0bb8db705b31f9ea5f6a02</param> </service> </servicedata> \ No newline at end of file ++++++ sbd-1.4.0+20191029.695f9ca.tar.xz -> sbd-1.4.1+20200113.4b617a1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.0+20191029.695f9ca/.travis.yml new/sbd-1.4.1+20200113.4b617a1/.travis.yml --- old/sbd-1.4.0+20191029.695f9ca/.travis.yml 2019-10-29 23:38:48.000000000 +0100 +++ new/sbd-1.4.1+20200113.4b617a1/.travis.yml 2020-01-13 14:48:24.000000000 +0100 @@ -1,33 +1,52 @@ +dist: bionic sudo: required language: c os: - linux - - linux-ppc64le + +arch: + - amd64 + - ppc64le + - s390x + - arm64 env: global: - PACKAGE=sbd - - BUILD_OS_TYPE=fedora BUILD_OS_DIST= BUILD_OS_VERSION=29 + # appealing idea to go with centos 8 as build-host but unfortunately that isn't available for all platforms + # and the docker-image isn't there for anything else but x86_64 + # - BUILD_OS_TYPE="centos:" BUILD_OS_DIST=centos BUILD_OS_VERSION=8 + # - BUILD_OS_PREPARE="yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && yum install -y mock yum-utils &&" + - BUILD_OS_TYPE="fedora:" BUILD_OS_DIST= BUILD_OS_VERSION=31 + - BUILD_OS_PREPARE="echo timeout=300 >> /etc/dnf/dnf.conf && dnf install -y mock dnf-utils findutils patch &&" matrix: exclude: - - os: linux - - os: linux-ppc64le + - arch: amd64 + - arch: ppc64le + - arch: s390x + - arch: arm64 include: - - os: linux - env: OS_ARCH=x86_64 OS_TYPE=centos OS_MOCK=epel OS_DIST=centos OS_VERSION=7 - - os: linux - env: OS_ARCH=x86_64 OS_TYPE=centos OS_MOCK=epel OS_DIST=centos OS_VERSION=6 - - os: linux - env: OS_ARCH=x86_64 OS_TYPE=fedora OS_MOCK=fedora OS_DIST= OS_VERSION=29 - - os: linux - env: OS_ARCH=x86_64 OS_TYPE=fedora OS_MOCK=fedora OS_DIST= OS_VERSION=30 - - os: linux - env: OS_ARCH=x86_64 OS_TYPE=fedora OS_MOCK=fedora OS_DIST= OS_VERSION=rawhide - - os: linux-ppc64le - env: OS_ARCH=ppc64le OS_TYPE=fedora OS_MOCK=fedora OS_DIST= OS_VERSION=30 + - arch: amd64 + env: OS_ARCH=x86_64 OS_TYPE="centos:" OS_MOCK=epel OS_DIST=centos OS_VERSION=7 OS_INSTALL="yum install -y" DOCKER_OPTS="--privileged" TEST_ENV="SBD_USE_DM=yes" + - arch: amd64 + env: OS_ARCH=x86_64 OS_TYPE="centos:" OS_MOCK=epel OS_DIST=centos OS_VERSION=6 OS_INSTALL="yum install -y" DOCKER_OPTS="--privileged" TEST_ENV="SBD_USE_DM=yes" + - arch: amd64 + env: OS_ARCH=x86_64 OS_TYPE="fedora:" OS_MOCK=fedora OS_DIST= OS_VERSION=31 OS_INSTALL="dnf install -y" DOCKER_OPTS="--privileged" TEST_ENV="SBD_USE_DM=yes" + - arch: amd64 + env: OS_ARCH=x86_64 OS_TYPE="fedora:" OS_MOCK=fedora OS_DIST= OS_VERSION=rawhide OS_INSTALL="dnf install -y" DOCKER_OPTS="--privileged" TEST_ENV="SBD_USE_DM=yes" + - arch: ppc64le + env: OS_ARCH=ppc64le OS_TYPE="fedora:" OS_MOCK=fedora OS_DIST= OS_VERSION=31 OS_INSTALL="dnf install --setopt=timeout=300 -y" DOCKER_OPTS="--cap-add=sys_admin" TEST_ENV="SBD_USE_DM=no" MOCK_OPTS="--config-opts=internal_dev_setup=False" + - arch: s390x + env: OS_ARCH=s390x OS_TYPE="fedora:" OS_MOCK=fedora OS_DIST= OS_VERSION=31 OS_INSTALL="dnf install -y" DOCKER_OPTS="--cap-add=sys_admin" TEST_ENV="SBD_USE_DM=no" MOCK_OPTS="--config-opts=internal_dev_setup=False" + - arch: arm64 + env: OS_ARCH=aarch64 OS_TYPE="fedora:" OS_MOCK=fedora OS_DIST= OS_VERSION=31 OS_INSTALL="dnf install -y" DOCKER_OPTS="--cap-add=sys_admin" TEST_ENV="SBD_USE_DM=no" MOCK_OPTS="--config-opts=internal_dev_setup=False" + - arch: amd64 + env: OS_ARCH=x86_64 OS_TYPE="opensuse/" OS_MOCK=opensuse-leap OS_DIST="leap:" OS_VERSION=15.1 OS_INSTALL="zypper --no-gpg-checks --non-interactive install" DOCKER_OPTS="--privileged" TEST_ENV="SBD_USE_DM=yes" + - arch: amd64 + env: OS_ARCH=x86_64 OS_TYPE="opensuse/" OS_MOCK=opensuse OS_DIST= OS_VERSION=tumbleweed OS_INSTALL="zypper --no-gpg-checks --non-interactive install" DOCKER_OPTS="--privileged" TEST_ENV="SBD_USE_DM=yes" services: - docker @@ -35,15 +54,17 @@ install: true script: + - BUILD_SUCCESS=false - make -f Makefile.am srpm PACKAGE=${PACKAGE} - - docker pull ${BUILD_OS_TYPE}:${BUILD_OS_DIST}${BUILD_OS_VERSION} - - docker run --privileged -v ${PWD}:/rpms ${BUILD_OS_TYPE}:${BUILD_OS_DIST}${BUILD_OS_VERSION} /bin/bash -c "dnf install -y mock dnf-utils && if test $OS_VERSION = rawhide; then sed -i /etc/mock/${OS_MOCK}-${OS_VERSION}-${OS_ARCH}.cfg -e s/gpgcheck.*/gpgcheck=0/g; fi && mock --no-clean -r ${OS_MOCK}-${OS_VERSION}-${OS_ARCH} --resultdir=/rpms --disable-plugin=yum_cache --disable-plugin=selinux --no-bootstrap-chroot --old-chroot /rpms/sbd*.src.rpm" - - ls ${PWD}/${PACKAGE}*.${OS_ARCH}.rpm - - docker pull ${OS_TYPE}:${OS_DIST}${OS_VERSION} - - docker run --privileged -v ${PWD}:/rpms ${OS_TYPE}:${OS_DIST}${OS_VERSION} /bin/bash -c "if test $OS_VERSION = rawhide; then yum update -y --nogpgcheck; fi && yum install -y device-mapper /rpms/${PACKAGE}*.${OS_ARCH}.rpm && /usr/share/sbd/regressions.sh && touch /rpms/regressions.sh.SUCCESS" + - docker pull ${BUILD_OS_TYPE}${BUILD_OS_DIST}${BUILD_OS_VERSION} + - docker run --cap-add=sys_admin -v ${PWD}:/rpms -v /proc:/var/lib/mock/${OS_MOCK}-${OS_VERSION}-${OS_ARCH}/root/proc -v ${PWD}:/rpms -v /sys:/var/lib/mock/${OS_MOCK}-${OS_VERSION}-${OS_ARCH}/root/sys ${BUILD_OS_TYPE}${BUILD_OS_DIST}${BUILD_OS_VERSION} /bin/bash -c "${BUILD_OS_PREPARE} if test $OS_VERSION = rawhide; then sed -i /etc/mock/${OS_MOCK}-${OS_VERSION}-${OS_ARCH}.cfg -e s/gpgcheck.*/gpgcheck=0/g; fi && rpm -ql mock|grep "/mounts.py\$"|xargs -n1 sed -e "/USE_NSPAWN/d" -e "/self.mountall_essential/d" -i && mkdir -p /var/lib/mock/${OS_MOCK}-${OS_VERSION}-${OS_ARCH}/root/etc/dnf && cp /etc/dnf/dnf.conf /var/lib/mock/${OS_MOCK}-${OS_VERSION}-${OS_ARCH}/root/etc/dnf && mock --no-clean -r ${OS_MOCK}-${OS_VERSION}-${OS_ARCH} --resultdir=/rpms ${MOCK_OPTS} --disable-plugin=root_cache --disable-plugin=tmpfs --disable-plugin=yum_cache --disable-plugin=selinux --no-bootstrap-chroot --old-chroot /rpms/sbd*.src.rpm" + - ls ${PWD}/${PACKAGE}*.${OS_ARCH}.rpm && BUILD_SUCCESS=true + - ${BUILD_SUCCESS} && docker pull ${OS_TYPE}${OS_DIST}${OS_VERSION} + - ${BUILD_SUCCESS} && docker run ${DOCKER_OPTS} -v ${PWD}:/rpms ${OS_TYPE}${OS_DIST}${OS_VERSION} /bin/bash -c "if test $OS_VERSION = rawhide; then dnf update -y --nogpgcheck; fi && ${OS_INSTALL} device-mapper /rpms/${PACKAGE}*.${OS_ARCH}.rpm && ${TEST_ENV} /usr/share/sbd/regressions.sh && touch /rpms/regressions.sh.SUCCESS" - ls ${PWD}/regressions.sh.SUCCESS addons: apt: packages: - rpm + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.0+20191029.695f9ca/Makefile.am new/sbd-1.4.1+20200113.4b617a1/Makefile.am --- old/sbd-1.4.0+20191029.695f9ca/Makefile.am 2019-10-29 23:38:48.000000000 +0100 +++ new/sbd-1.4.1+20200113.4b617a1/Makefile.am 2020-01-13 14:48:24.000000000 +0100 @@ -43,7 +43,7 @@ echo `date`: Using existing tarball: $(TARFILE); \ else \ rm -f $(PACKAGE).tar.*; \ - (git archive --prefix=$(distdir)/ $(shell echo $(TAG)|cut -f1 -d-) || tar -c --transform="s,^,$(distdir)/," --exclude="*.tar.*" --exclude="$(distdir)" --exclude="*.o" --exclude="*.8" --exclude="config.*" --exclude="Makefile" --exclude="Makefile.in" --exclude="stamp-*" --exclude="*.service" --exclude="sbd" --exclude="*.m4" --exclude="*.cache" --exclude="configure" --exclude="*.list" --exclude="depcomp" --exclude="install-sh" --exclude="missing" --exclude="compile" --exclude="sbd.sh" --exclude="~" --exclude="*.swp" --exclude="*.patch" --exclude="*.diff" --exclude="*.orig" --exclude="*.rej" --exclude="*.rpm" --exclude=".deps" --exclude="test-driver" *) | gzip > $(TARFILE); \ + (git archive --prefix=$(distdir)/ $(shell echo $(TAG)|cut -f1 -d-) || tar -c --transform="s,^,$(distdir)/," --exclude="*.tar.*" --exclude="$(distdir)" --exclude="*.o" --exclude="*.8" --exclude="config.*" --exclude="libtool" --exclusive="ltmain.sh*" --exclude="Makefile" --exclude="Makefile.in" --exclude="stamp-*" --exclude="*.service" --exclude="sbd" --exclude="*.m4" --exclude="*.cache" --exclude="configure" --exclude="*.list" --exclude="depcomp" --exclude="install-sh" --exclude="missing" --exclude="compile" --exclude="sbd.sh" --exclude="~" --exclude="*.swp" --exclude="*.patch" --exclude="*.diff" --exclude="*.orig" --exclude="*.rej" --exclude="*.rpm" --exclude=".deps" --exclude="test-driver" *) | gzip > $(TARFILE); \ if test -n "$$(git status -s)" || test "$(INJECT_GIT_COMMIT)" = "yes"; then \ if test -n "$$(git status -s)"; then git diff HEAD --name-only|grep -v "^\."|xargs -n1 git diff HEAD > uncommitted.diff; fi; \ rm -rf $(distdir); tar -xzf $(TARFILE); rm $(TARFILE); \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.0+20191029.695f9ca/agent/sbd.in new/sbd-1.4.1+20200113.4b617a1/agent/sbd.in --- old/sbd-1.4.0+20191029.695f9ca/agent/sbd.in 2019-10-29 23:38:48.000000000 +0100 +++ new/sbd-1.4.1+20200113.4b617a1/agent/sbd.in 2020-01-13 14:48:24.000000000 +0100 @@ -45,7 +45,7 @@ esac crm_timeout=$[$(crm_attribute -t crm_config -G -n stonith-timeout -d 20s -q | sed -e 's/\(.*\)s/\1/' -e 's/\(.*\)m/\1*60/')] sbd_timeout=$(sbd -d $sbd_device dump | perl -ne 'if (/msgwait.*: (\d+)/) { print "$1\n"; }' | head -n 1) - if [ "$sbd_timeout" -eq "0" ]; then + if [ -z "$sbd_timeout" -o "$sbd_timeout" = "0" ]; then return fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.0+20191029.695f9ca/configure.ac new/sbd-1.4.1+20200113.4b617a1/configure.ac --- old/sbd-1.4.0+20191029.695f9ca/configure.ac 2019-10-29 23:38:48.000000000 +0100 +++ new/sbd-1.4.1+20200113.4b617a1/configure.ac 2020-01-13 14:48:24.000000000 +0100 @@ -20,7 +20,7 @@ dnl checks for system services AC_INIT([sbd], - [1.4.0], + [1.4.1], [l...@suse.com]) m4_include([tests-opt.m4]) AC_CANONICAL_HOST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.0+20191029.695f9ca/sbd.spec new/sbd-1.4.1+20200113.4b617a1/sbd.spec --- old/sbd-1.4.0+20191029.695f9ca/sbd.spec 2019-10-29 23:38:48.000000000 +0100 +++ new/sbd-1.4.1+20200113.4b617a1/sbd.spec 2020-01-13 14:48:24.000000000 +0100 @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%global commit 5705703da3db01bb4c34fd73ae33f24b43a16b78-mod +%global commit aca7907c1973f331a4f192a0d50e6443840daab6 %global shortcommit %(echo %{commit}|cut -c1-8) %global modified %(echo %{commit}-|cut -f2 -d-) %global github_owner beekhof @@ -25,7 +25,7 @@ Summary: Storage-based death License: GPLv2+ Group: System Environment/Daemons -Version: 1.4.0 +Version: 1.4.1 Release: 99.%{buildnum}.%{shortcommit}.%{modified}git%{?dist} Url: https://github.com/%{github_owner}/%{name} Source0: https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz @@ -144,6 +144,34 @@ %{_libdir}/libsbdtestbed* %changelog +* Tue Nov 19 2019 <klaus.wennin...@aon.at> - 1.4.1-99.1.aca7907c.git +- improvements/clarifications in documentation +- properly finalize cmap connection when disconnected from cluster +- make handling of cib-connection loss more robust +- silence some coverity findings +- overhaul log for reasonable prios and details +- if current slice doesn't have rt-budget move to root-slice +- periodically ping corosync daemon for liveness +- actually use crashdump timeout if configured +- avoid deprecated names for g_main-loop-funcitons +- conflict with fence-agents-sbd < 4.5.0 +- rather require corosync-devel provided by most distributions +- make devices on cmdline overrule those coming via SBD_DEVICE +- make 15s timeout on s390 be used consistently +- improve build/test for CI-friendlyness +- * add autogen.sh +- * enable/improve out-of-tree-building +- * make tar generation smarter +- * don't modify sbd.spec +- * make distcheck-target work +- * Add tests/regressions.sh to check-target +- * use unique devmapper names for multiple tests in parallel +- * consistently use serial test-harness for visible progress +- * package tests into separate package (not packaged before) +- * add preload-library to intercept reboots while testing +- * add tests for sbd in daemon-mode & watchdog-dev-handling +- * make tests work in non-privileged containers + * Mon Jan 14 2019 <klaus.wennin...@aon.at> - 1.4.0-0.1.2d595fdd.git - updated travis-CI (ppc64le-build, fedora29, remove need for alectolytic-build-container) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.0+20191029.695f9ca/tests/configure.ac new/sbd-1.4.1+20200113.4b617a1/tests/configure.ac --- old/sbd-1.4.0+20191029.695f9ca/tests/configure.ac 2019-10-29 23:38:48.000000000 +0100 +++ new/sbd-1.4.1+20200113.4b617a1/tests/configure.ac 2020-01-13 14:48:24.000000000 +0100 @@ -20,7 +20,7 @@ dnl checks for system services AC_INIT([sbd], - [1.4.0], + [1.4.1], [l...@suse.com]) m4_include([../tests-opt.m4]) AC_CANONICAL_HOST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.0+20191029.695f9ca/tests/regressions.sh new/sbd-1.4.1+20200113.4b617a1/tests/regressions.sh --- old/sbd-1.4.0+20191029.695f9ca/tests/regressions.sh 2019-10-29 23:38:48.000000000 +0100 +++ new/sbd-1.4.1+20200113.4b617a1/tests/regressions.sh 2020-01-13 14:48:24.000000000 +0100 @@ -32,7 +32,7 @@ : ${SBD_USE_DM:="yes"} sbd() { - LD_PRELOAD=${SBD_PRELOAD} SBD_WATCHDOG_TIMEOUT=5 SBD_DEVICE="${SBD_DEVICE}" SBD_PRELOAD_LOG=${SBD_PRELOAD_LOG} SBD_WATCHDOG_DEV=/dev/watchdog setsid ${SBD_BINARY} -p ${SBD_PIDFILE} $* + LD_PRELOAD=${SBD_PRELOAD} SBD_WATCHDOG_TIMEOUT=5 SBD_DEVICE="${SBD_DEVICE}" SBD_PRELOAD_LOG=${SBD_PRELOAD_LOG} SBD_WATCHDOG_DEV=/dev/watchdog setsid ${SBD_BINARY} -p ${SBD_PIDFILE} "$@" } sbd_wipe_disk() { @@ -98,26 +98,26 @@ pkill -TERM --pidfile ${SBD_PIDFILE} 2>/dev/null sleep 5 pkill -KILL --pidfile ${SBD_PIDFILE} 2>/dev/null - pkill -KILL --parent $(cat ${SBD_PIDFILE} 2>/dev/null) 2>/dev/null + pkill -KILL --parent "$(cat ${SBD_PIDFILE} 2>/dev/null)" 2>/dev/null echo > ${SBD_PIDFILE} } _ok() { - echo -- $@ - $@ + echo "-- $*" + "$@" rc=$? if [ $rc -ne 0 ]; then - echo "$@ failed with $rc" + echo "$* failed with $rc" exit $rc fi } _no() { - echo -- $@ - $@ + echo "-- $*" + "$@" rc=$? if [ $rc -eq 0 ]; then - echo "$@ did NOT fail ($rc)" + echo "$* did NOT fail ($rc)" exit $rc fi return 0 @@ -126,7 +126,7 @@ _in_log() { grep "$@" ${SBD_PRELOAD_LOG} >/dev/null if [ $? -ne 0 ]; then - echo "didn't find '$@' in log:" + echo "didn't find '$*' in log:" cat ${SBD_PRELOAD_LOG} sbd_daemon_cleanup exit 1 @@ -227,10 +227,10 @@ sbd_daemon_cleanup sbd -d ${D[1]} -d ${D[2]} -d ${D[3]} -n test-1 watch sleep 10 - _ok kill -0 $(cat ${SBD_PIDFILE}) - kill -STOP $(cat ${SBD_PIDFILE}) + _ok kill -0 "$(cat ${SBD_PIDFILE})" + kill -STOP "$(cat ${SBD_PIDFILE})" sleep 10 - kill -CONT $(cat ${SBD_PIDFILE}) 2>/dev/null + kill -CONT "$(cat ${SBD_PIDFILE})" 2>/dev/null _in_log "watchdog fired" } @@ -298,7 +298,7 @@ SBD_TIMEOUT_ACTION=off sbd -d ${D[1]} -w /dev/null -n test-1 watch sleep 2 sbd_wipe_disk ${D[1]} - sleep 10 + sleep 15 _in_log "sysrq-trigger ('o')" _in_log "reboot (poweroff)" } @@ -310,7 +310,7 @@ SBD_TIMEOUT_ACTION=crashdump sbd -d ${D[1]} -w /dev/null -n test-1 watch sleep 2 sbd_wipe_disk ${D[1]} - sleep 10 + sleep 15 _in_log "sysrq-trigger ('c')" }