Merge pull request #128 from wenningerk/version_bump

Version bump to 1.5.0

Author: wenningerk

Makefile.am

@@ -26,7 +26,7 @@ MOCK_OPTIONS	?= --resultdir=$(RPM_ROOT)/mock --no-cleanup-after
 BUILD_COUNTER	?= build.counter
 COUNT           = $(shell expr 1 + 0$(shell cat $(BUILD_COUNTER)))
 
-COMMIT_COUNTER	?= $(shell git describe --tags --long --always --match v$(SPEC_VERSION) | cut -f 2 -d-)
+COMMIT_COUNTER	?= $(shell git describe --tags --long --always --match v$(SPEC_VERSION) | cut -f 2 -d- -s)
 
 TESTS           = tests/regressions.sh
 export SBD_BINARY := src/sbd
@@ -74,7 +74,7 @@ spec:
 		echo $(COUNT) > $(BUILD_COUNTER); \
 	fi
 	if [ -n $(COMMIT_COUNTER) ]; then \
-		sed -i 's/global\ commit_counter.*/global\ commit_counter\ $(COMMIT_COUNTER)/' $(distdir)/$(PACKAGE).spec; \
+		sed -i 's/global\ commit_counter.*/global\ commit_counter\ $(COMMIT_COUNTER)-1/' $(distdir)/$(PACKAGE).spec; \
 	fi
 
 srpm:	export spec

configure.ac

@@ -20,7 +20,7 @@ dnl     checks for library functions
 dnl     checks for system services
 
 AC_INIT([sbd], 
-	[1.4.2],
+	[1.5.0],
 	[lmb@suse.com])
 m4_include([tests-opt.m4])
 AC_CANONICAL_HOST
@@ -332,15 +332,15 @@ AC_DEFINE_UNQUOTED(SBD_WATCHDOG_TIMEOUT_DEFAULT, $SBD_WATCHDOG_TIMEOUT_DEFAULT,
     Timeout in seconds SBD will configure the watchdog per default)
 
 if test x"${SBD_SYNC_RESOURCE_STARTUP_DEFAULT}" = x""; then
-    SBD_SYNC_RESOURCE_STARTUP_DEFAULT=no
+    SBD_SYNC_RESOURCE_STARTUP_DEFAULT=yes
 fi
 AC_SUBST(SBD_SYNC_RESOURCE_STARTUP_DEFAULT)
 dnl rather pass to C as a string and interpret there for consistent interpretation
 AC_DEFINE_UNQUOTED(SBD_SYNC_RESOURCE_STARTUP_DEFAULT, "${SBD_SYNC_RESOURCE_STARTUP_DEFAULT}",
     Default for SBD_SYNC_RESOURCE_STARTUP if not given in SBD configuration file explicitly)
 
 if test x"${SBD_SYNC_RESOURCE_STARTUP_SYSCONFIG}" = x""; then
-    SBD_SYNC_RESOURCE_STARTUP_SYSCONFIG=no
+    SBD_SYNC_RESOURCE_STARTUP_SYSCONFIG=${SBD_SYNC_RESOURCE_STARTUP_DEFAULT}
 fi
 AC_SUBST(SBD_SYNC_RESOURCE_STARTUP_SYSCONFIG)
 

sbd.spec

@@ -15,7 +15,7 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-%global longcommit bfeee963f7363720da91a018045ca6746d822ba0
+%global longcommit 2a00ac70f7200ed238a5bc73392e6a59a06fe904
 %global shortcommit %(echo %{longcommit}|cut -c1-8)
 %global modified %(echo %{longcommit}-|cut -f2 -d-)
 %global github_owner Clusterlabs
@@ -30,14 +30,28 @@
 %global watchdog_timeout_default 5
 %endif
 
-%global sync_resource_startup_default no
-%global sync_resource_startup_sysconfig no
+# Be careful with sync_resource_startup_default
+# being enabled. This configuration has
+# to be in sync with configuration in pacemaker
+# where it is called sbd_sync - assure by e.g.
+# mutual rpm dependencies.
+%bcond_without sync_resource_startup_default
+# Syncing enabled per default will lead to
+# syncing enabled on upgrade without adaption
+# of the config.
+# Setting can still be overruled via sysconfig.
+# The setting in the config-template packaged
+# will follow the default if below is is left
+# empty. But it is possible to have the setting
+# in the config-template deviate from the default
+# by setting below to an explicit 'yes' or 'no'.
+%global sync_resource_startup_sysconfig ""
 
 Name:           sbd
 Summary:        Storage-based death
 License:        GPLv2+
 Group:          System Environment/Daemons
-Version:        1.4.2
+Version:        1.5.0
 Release:        99.%{buildnum}.%{shortcommit}.%{modified}git%{?dist}
 Url:            https://github.com/%{github_owner}/%{name}
 Source0:        https://github.com/%{github_owner}/%{name}/archive/%{longcommit}/%{name}-%{longcommit}.tar.gz
@@ -72,6 +86,9 @@ ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
 
 This package contains the storage-based death functionality.
 
+Available rpmbuild rebuild options:
+  --with(out) : sync_resource_startup_default
+
 %package tests
 Summary:        Storage-based death environment for regression tests
 License:        GPLv2+
@@ -91,7 +108,7 @@ regression-testing sbd.
 ./autogen.sh
 export CFLAGS="$RPM_OPT_FLAGS -Wall -Werror"
 %configure --with-watchdog-timeout-default=%{watchdog_timeout_default} \
-           --with-sync-resource-startup-default=%{sync_resource_startup_default} \
+           --with-sync-resource-startup-default=%{?with_sync_resource_startup_default:yes}%{!?with_sync_resource_startup_default:no}  \
            --with-sync-resource-startup-sysconfig=%{sync_resource_startup_sysconfig}
 make %{?_smp_mflags}
 ###########################################################
@@ -155,6 +172,14 @@ rm -rf %{buildroot}
 %{_libdir}/libsbdtestbed*
 
 %changelog
+* Tue Jun 8 2021 <klaus.wenninger@aon.at> - 1.5.0-99.0.2a00ac70.git
+- default to resource-syncing with pacemaker in spec-file and configure.ac
+  This default has to match between sbd and pacemaker and
+  thus qualifies this release for a minor-version-bump
+- fix some regressions introduced by adding configurability previously
+- adapt description of startup/shutdown sync with pacemaker
+- make watchdog warning messages more understandable
+
 * Wed Dec 2 2020 <klaus.wenninger@aon.at> - 1.4.2-99.1.bfeee963.git
 - improve build/CI-friendlyness
 - * travis: switch to F32 as build-host

tests/configure.ac

@@ -20,7 +20,7 @@ dnl     checks for library functions
 dnl     checks for system services
 
 AC_INIT([sbd],
-	[1.4.2],
+	[1.5.0],
 	[lmb@suse.com])
 m4_include([../tests-opt.m4])
 AC_CANONICAL_HOST