From 0b5381e372674c0f9535e8475d03e32e4208fd7c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2016 05:43:57 +0000 Subject: import sbd-1.2.1-21.el7 --- diff --git a/.gitignore b/.gitignore index e9cd8f8..0ae94f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/sbd-1ee3503cbc52b73876b6aae5471d3b6f7c092bf5.tar.gz +SOURCES/sbd-c511b0692784a7085df4b1ae35748fb318fa79ee.tar.gz diff --git a/.sbd.metadata b/.sbd.metadata index a89201e..3092fb1 100644 --- a/.sbd.metadata +++ b/.sbd.metadata @@ -1 +1 @@ -6f21f7bb644b717fdf433be308abae1e06f3c77c SOURCES/sbd-1ee3503cbc52b73876b6aae5471d3b6f7c092bf5.tar.gz +17b4eb4eec962dddd7991d49f9977052032ccb40 SOURCES/sbd-c511b0692784a7085df4b1ae35748fb318fa79ee.tar.gz diff --git a/SOURCES/sbd-local-debug.patch b/SOURCES/sbd-local-debug.patch deleted file mode 100644 index a9d26d7..0000000 --- a/SOURCES/sbd-local-debug.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 617e138b4c3786208238a43ef2ff6e9543535161 -Author: Andrew Beekhof -Date: Fri Oct 24 11:13:14 2014 +1100 - - Correctly turn on just sbd's debug logging - -diff --git a/src/sbd-inquisitor.c b/src/sbd-inquisitor.c -index 61ee8be..6f7d3e4 100644 ---- a/src/sbd-inquisitor.c -+++ b/src/sbd-inquisitor.c -@@ -805,14 +805,15 @@ int main(int argc, char **argv, char **envp) - case 'v': - debug++; - if(debug == 1) { -- qb_log_filter_ctl(QB_LOG_SYSLOG, QB_LOG_FILTER_ADD, QB_LOG_FILTER_FILE, "sbd-*", LOG_DEBUG); -- qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_ADD, QB_LOG_FILTER_FILE, "sbd-*", LOG_DEBUG); -+ qb_log_filter_ctl(QB_LOG_SYSLOG, QB_LOG_FILTER_ADD, QB_LOG_FILTER_FILE, "sbd-common.c,sbd-inquisitor.c,sbd-md.c,sbd-pacemaker.c", LOG_DEBUG); -+ qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_ADD, QB_LOG_FILTER_FILE, "sbd-common.c,sbd-inquisitor.c,sbd-md.c,sbd-pacemaker.c", LOG_DEBUG); - cl_log(LOG_INFO, "Verbose mode enabled."); - - } else if(debug == 2) { - /* Go nuts, turn on pacemaker's logging too */ - qb_log_filter_ctl(QB_LOG_SYSLOG, QB_LOG_FILTER_ADD, QB_LOG_FILTER_FILE, "*", LOG_DEBUG); - qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_ADD, QB_LOG_FILTER_FILE, "*", LOG_DEBUG); -+ cl_log(LOG_INFO, "Verbose library mode enabled."); - } - break; - case 'T': diff --git a/SOURCES/sbd-pcmk-health.patch b/SOURCES/sbd-pcmk-health.patch deleted file mode 100644 index fe89820..0000000 --- a/SOURCES/sbd-pcmk-health.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit bfc01977f7413977c51f15f61fef801d2bf9c5f9 -Author: Andrew Beekhof -Date: Fri Oct 24 12:03:41 2014 +1100 - - Repair startup when no disks are present - -diff --git a/src/sbd-pacemaker.c b/src/sbd-pacemaker.c -index f62d728..7296ad2 100644 ---- a/src/sbd-pacemaker.c -+++ b/src/sbd-pacemaker.c -@@ -104,7 +104,8 @@ static int check_ais = 0; - cl_log(lvl, fmt, ##args); \ - last_state = state; \ - } \ -- } while(0) -+ healthy = state; \ -+ } while(0) - - static cib_t *cib = NULL; - static xmlNode *current_cib = NULL; -@@ -300,7 +301,6 @@ compute_status(pe_working_set_t * data_set) - - if (data_set->dc_node == NULL) { - LOGONCE(pcmk_health_transient, LOG_INFO, "We don't have a DC right now."); -- healthy = 2; - goto out; - } - -@@ -325,13 +325,13 @@ compute_status(pe_working_set_t * data_set) - LOGONCE(pcmk_health_online, LOG_INFO, "Node state: online"); - ever_had_quorum = TRUE; - -- } else if(ever_had_quorum == FALSE) { -- LOGONCE(pcmk_health_transient, LOG_INFO, "We do not have quorum yet"); -- - } else if(servant_count > 0) { - LOGONCE(pcmk_health_noquorum, LOG_WARNING, "Quorum lost"); - goto out; - -+ } else if(ever_had_quorum == FALSE) { -+ LOGONCE(pcmk_health_online, LOG_INFO, "We do not have quorum yet"); -+ - } else { - /* We lost quorum, and there are no disks present - * Setting healthy > 2 here will result in us self-fencing diff --git a/SOURCES/sbd-proc-pid.patch b/SOURCES/sbd-proc-pid.patch deleted file mode 100644 index 45a4775..0000000 --- a/SOURCES/sbd-proc-pid.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit d172f2bb9e6e530039df3a001b9ce3eb76dc4a75 -Author: Andrew Beekhof -Date: Mon Oct 27 10:28:51 2014 +1100 - - Correctly enable /proc/pid validation in sbd_lock_running() - -diff --git a/configure.ac b/configure.ac -index ec7fced..540fd57 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -78,9 +78,17 @@ DISK=0 - if test "x${enable_shared_disk}" != xno ; then - DISK=1 - fi -+ - AC_DEFINE_UNQUOTED(SUPPORT_SHARED_DISK, $DISK, Turn on functionality that requires shared disk) - AM_CONDITIONAL(SUPPORT_SHARED_DISK, test "$DISK" = "1") - -+if -+ test -e /proc/$$ -+then -+ echo "/proc/{pid} is supported" -+ AC_DEFINE_UNQUOTED(HAVE_PROC_PID, 1, Define to 1 if /proc/{pid} is supported.) -+fi -+ - dnl ********************************************************************** - dnl Check for various argv[] replacing functions on various OSs - dnl diff --git a/SOURCES/sbd-timeout-in-seconds.patch b/SOURCES/sbd-timeout-in-seconds.patch deleted file mode 100644 index dc0232d..0000000 --- a/SOURCES/sbd-timeout-in-seconds.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 39adc895b1bd3455de3cea8f77a0aa6252116a04 -Author: Andrew Beekhof -Date: Mon Jan 12 13:53:22 2015 +1100 - - Leave SBD_WATCHDOG_TIMEOUT in sectods - -diff --git a/src/sbd-inquisitor.c b/src/sbd-inquisitor.c -index 52ca9ff..918dc35 100644 ---- a/src/sbd-inquisitor.c -+++ b/src/sbd-inquisitor.c -@@ -767,7 +767,7 @@ int main(int argc, char **argv, char **envp) - - value = getenv("SBD_WATCHDOG_TIMEOUT"); - if(value) { -- timeout_watchdog = crm_get_msec(value); -+ timeout_watchdog = crm_get_msec(value) / 1000; - } - - value = getenv("SBD_PIDFILE"); diff --git a/SPECS/sbd.spec b/SPECS/sbd.spec index 8fa622d..b560d94 100644 --- a/SPECS/sbd.spec +++ b/SPECS/sbd.spec @@ -15,10 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%global commit 1ee3503cbc52b73876b6aae5471d3b6f7c092bf5 +%global commit c511b0692784a7085df4b1ae35748fb318fa79ee %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global github_owner beekhof -%global buildnum 5 +%global github_owner Clusterlabs +%global buildnum 21 Name: sbd Summary: Storage-based death @@ -43,10 +43,6 @@ BuildRequires: libxml2-devel BuildRequires: pkgconfig BuildRequires: python-devel Patch1: sbd-no-storage-option.patch -Patch2: sbd-local-debug.patch -Patch3: sbd-pcmk-health.patch -Patch4: sbd-proc-pid.patch -Patch5: sbd-timeout-in-seconds.patch %if 0%{?rhel} > 0 ExclusiveArch: i686 x86_64 s390x @@ -84,6 +80,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man8/sbd* %if %{defined _unitdir} install -D -m 0644 src/sbd.service $RPM_BUILD_ROOT/%{_unitdir}/sbd.service +install -D -m 0644 src/sbd_remote.service $RPM_BUILD_ROOT/%{_unitdir}/sbd_remote.service %endif mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig @@ -97,12 +94,15 @@ rm -rf %{buildroot} %if %{defined _unitdir} %post %systemd_post sbd.service +%systemd_post sbd_remote.service %preun %systemd_preun sbd.service +%systemd_preun sbd_remote.service %postun %systemd_postun sbd.service +%systemd_postun sbd_remote.service %endif %files @@ -110,13 +110,24 @@ rm -rf %{buildroot} %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/sbd %{_sbindir}/sbd +#%{_datadir}/sbd #doc %{_mandir}/man8/sbd* %if %{defined _unitdir} %{_unitdir}/sbd.service +%{_unitdir}/sbd_remote.service %endif %doc COPYING %changelog +* Fri Apr 15 2016 - 1.2.1-21 +- Rebuild for new pacemaker + Resolves: rhbz#1320400 + +* Fri Apr 15 2016 - 1.2.1-20 +- tarball updated to c511b0692784a7085df4b1ae35748fb318fa79ee + from https://github.com/Clusterlabs/sbd + Resolves: rhbz#1324240 + * Thu Jul 23 2015 - 1.2.1-5 - Rebuild for pacemaker