Hello community, here is the log from the commit of package sbd for openSUSE:Factory checked in at 2017-07-21 22:50:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbd (Old) and /work/SRC/openSUSE:Factory/.sbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbd" Fri Jul 21 22:50:51 2017 rev:18 rq:511847 version:1.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sbd/sbd.changes 2017-07-17 09:11:38.703822774 +0200 +++ /work/SRC/openSUSE:Factory/.sbd.new/sbd.changes 2017-07-21 22:50:53.148146516 +0200 @@ -1,0 +2,14 @@ +Fri Jul 21 09:06:51 UTC 2017 - [email protected] + +- Fix node name parameter in manpage +- Don't reboot if off is requested + +- sbd-inquisitor: cleanup_servant_by_pid() should be static + * Drop sbd-cleanup_servant_by_pid-static.patch which has been merged upstream + +- sbd.sh: Use a more obvious variable on parsing devices (bsc#1033934) +- sbd-inquisitor: Do not create duplicate servants (bsc#1033934) +- sbd-inquisitor: Correctly look up servant by device name (bsc#1033934) +- Upstream version cs: 11262fbc80364f2993a9876a2be82f4170c41e4e + +------------------------------------------------------------------- Old: ---- sbd-1.3.0+20170530.a0bc43b.tar.bz2 sbd-cleanup_servant_by_pid-static.patch New: ---- sbd-1.3.0+20170624.11262fb.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbd.spec ++++++ --- /var/tmp/diff_new_pack.m4C2XC/_old 2017-07-21 22:50:53.836049478 +0200 +++ /var/tmp/diff_new_pack.m4C2XC/_new 2017-07-21 22:50:53.840048914 +0200 @@ -17,7 +17,7 @@ # -%global commit 1.3.0+20170530.a0bc43b +%global commit 1.3.0+20170624.11262fb Name: sbd Version: 1.3.0 @@ -27,10 +27,9 @@ Group: Productivity/Clustering/HA Url: https://github.com/ClusterLabs/sbd Source: %{name}-%{commit}.tar.bz2 -Patch1: sbd-cleanup_servant_by_pid-static.patch -Patch2: bug-1047372_sbd-SBD_WATCHDOG-compatibility.patch -Patch3: bug-1046421_sbd-enable-pacemaker-integration-by-default.patch -Patch4: bug-1047376_sbd-not-use-watchdog-conflicting-options.patch +Patch1: bug-1047372_sbd-SBD_WATCHDOG-compatibility.patch +Patch2: bug-1046421_sbd-enable-pacemaker-integration-by-default.patch +Patch3: bug-1047376_sbd-not-use-watchdog-conflicting-options.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: e2fsprogs-devel ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.m4C2XC/_old 2017-07-21 22:50:53.876043837 +0200 +++ /var/tmp/diff_new_pack.m4C2XC/_new 2017-07-21 22:50:53.880043273 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ClusterLabs/sbd.git</param> - <param name="changesrevision">a0bc43b17fcb997fe4c09731db2126ab350cfb50</param> + <param name="changesrevision">11262fbc80364f2993a9876a2be82f4170c41e4e</param> </service> </servicedata> ++++++ sbd-1.3.0+20170530.a0bc43b.tar.bz2 -> sbd-1.3.0+20170624.11262fb.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.3.0+20170530.a0bc43b/.git_info new/sbd-1.3.0+20170624.11262fb/.git_info --- old/sbd-1.3.0+20170530.a0bc43b/.git_info 2017-06-02 10:53:19.188935542 +0200 +++ new/sbd-1.3.0+20170624.11262fb/.git_info 2017-07-21 10:57:11.525946369 +0200 @@ -1 +1 @@ -v1.3.0-6-ga0bc43b +v1.3.0-15-g11262fb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.3.0+20170530.a0bc43b/man/sbd.8.pod new/sbd-1.3.0+20170624.11262fb/man/sbd.8.pod --- old/sbd-1.3.0+20170530.a0bc43b/man/sbd.8.pod 2017-05-31 01:07:27.000000000 +0200 +++ new/sbd-1.3.0+20170624.11262fb/man/sbd.8.pod 2017-06-24 06:29:09.000000000 +0200 @@ -62,7 +62,7 @@ Display a concise summary of C<sbd> options. -=item B<-c> I<node> +=item B<-n> I<node> Set local node name; defaults to C<uname -n>. This should not need to be set. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.3.0+20170530.a0bc43b/src/sbd-common.c new/sbd-1.3.0+20170624.11262fb/src/sbd-common.c --- old/sbd-1.3.0+20170530.a0bc43b/src/sbd-common.c 2017-05-31 01:07:27.000000000 +0200 +++ new/sbd-1.3.0+20170624.11262fb/src/sbd-common.c 2017-06-24 06:29:09.000000000 +0200 @@ -487,8 +487,10 @@ } else { watchdog_close(false); sysrq_trigger(kind); - if(reboot(RB_AUTOBOOT) < 0) { - cl_perror("Reboot failed"); + if (kind != 'o') { + if(reboot(RB_AUTOBOOT) < 0) { + cl_perror("Reboot failed"); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.3.0+20170530.a0bc43b/src/sbd-inquisitor.c new/sbd-1.3.0+20170624.11262fb/src/sbd-inquisitor.c --- old/sbd-1.3.0+20170530.a0bc43b/src/sbd-inquisitor.c 2017-05-31 01:07:27.000000000 +0200 +++ new/sbd-1.3.0+20170624.11262fb/src/sbd-inquisitor.c 2017-06-24 06:29:09.000000000 +0200 @@ -50,6 +50,11 @@ struct servants_list_item *s = servants_leader; struct servants_list_item *newbie; + if (lookup_servant_by_dev(devname)) { + cl_log(LOG_DEBUG, "Servant %s already exists", devname); + return; + } + newbie = malloc(sizeof(*newbie)); if (!newbie) { fprintf(stderr, "malloc failed in recruit_servant.\n"); @@ -104,7 +109,7 @@ struct servants_list_item *s; for (s = servants_leader; s; s = s->next) { - if (strncasecmp(s->devname, devname, strlen(s->devname))) + if (strcasecmp(s->devname, devname) == 0) break; } return s; @@ -194,7 +199,7 @@ } } -inline void cleanup_servant_by_pid(pid_t pid) +static inline void cleanup_servant_by_pid(pid_t pid) { struct servants_list_item* s; @@ -1076,7 +1081,7 @@ #endif if (strcmp(argv[optind], "watch") == 0) { - /* sleep $(sbd -d "$SBD_DEVICE" dump | grep -m 1 msgwait | awk '{print $4}') 2>/dev/null */ + /* sleep $(sbd $SBD_DEVICE_ARGS dump | grep -m 1 msgwait | awk '{print $4}') 2>/dev/null */ /* We only want this to have an effect during watch right now; * pinging and fencing would be too confused */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.3.0+20170530.a0bc43b/src/sbd.sh new/sbd-1.3.0+20170624.11262fb/src/sbd.sh --- old/sbd-1.3.0+20170530.a0bc43b/src/sbd.sh 2017-05-31 01:07:27.000000000 +0200 +++ new/sbd-1.3.0+20170624.11262fb/src/sbd.sh 2017-06-24 06:29:09.000000000 +0200 @@ -38,7 +38,7 @@ exit 1 fi SBD_DEVS=${SBD_DEVICE%;} -SBD_DEVICE=${SBD_DEVS//;/ -d } +SBD_DEVICE_ARGS="-d ${SBD_DEVS//;/ -d }" : ${SBD_PIDFILE:=/var/run/sbd.pid} SBD_OPTS+=" -p $SBD_PIDFILE" @@ -62,12 +62,12 @@ start() { if ! pidofproc -p $SBD_PIDFILE $SBD_BIN >/dev/null 2>&1 ; then - if ! $SBD_BIN -d $SBD_DEVICE $SBD_OPTS watch ; then + if ! $SBD_BIN $SBD_DEVICE_ARGS $SBD_OPTS watch ; then echo "SBD failed to start; aborting." exit 1 fi if ocf_is_true ${SBD_DELAY_START} ; then - sleep $($SBD_BIN -d $SBD_DEVICE dump | grep -m 1 msgwait | awk '{print $4}') 2>/dev/null + sleep $($SBD_BIN $SBD_DEVICE_ARGS dump | grep -m 1 msgwait | awk '{print $4}') 2>/dev/null fi else return 0 @@ -75,7 +75,7 @@ } stop() { - if ! $SBD_BIN -d $SBD_DEVICE -D $SBD_OPTS message LOCAL exit ; then + if ! $SBD_BIN $SBD_DEVICE_ARGS -D $SBD_OPTS message LOCAL exit ; then echo "SBD failed to stop; aborting." exit 1 fi
