Hello community, here is the log from the commit of package sbd for openSUSE:Factory checked in at 2018-03-19 23:38:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbd (Old) and /work/SRC/openSUSE:Factory/.sbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbd" Mon Mar 19 23:38:24 2018 rev:23 rq:588123 version:1.3.1+20180316.8873890 Changes: -------- --- /work/SRC/openSUSE:Factory/sbd/sbd.changes 2018-02-09 15:52:04.245641167 +0100 +++ /work/SRC/openSUSE:Factory/.sbd.new/sbd.changes 2018-03-19 23:38:25.881238333 +0100 @@ -1,0 +2,12 @@ +Sat Mar 17 08:44:16 UTC 2018 - [email protected] + +- Update to version 1.3.1+20180316.8873890: +- Fix: add Documentation value to systemd services + +------------------------------------------------------------------- +Tue Mar 13 19:12:53 UTC 2018 - [email protected] + +- Update to version 1.3.1+20180313.fe5fe1d: +- Build: sbd-pacemaker: Query CIB directly with the API instead of get_cib_copy() (bsc#1084689) + +------------------------------------------------------------------- Old: ---- sbd-1.3.1+20180202.cc3e4cb.tar.xz New: ---- sbd-1.3.1+20180316.8873890.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbd.spec ++++++ --- /var/tmp/diff_new_pack.VF8ZRG/_old 2018-03-19 23:38:26.653210484 +0100 +++ /var/tmp/diff_new_pack.VF8ZRG/_new 2018-03-19 23:38:26.665210052 +0100 @@ -23,7 +23,7 @@ %endif Name: sbd -Version: 1.3.1+20180202.cc3e4cb +Version: 1.3.1+20180316.8873890 Release: 0 Summary: Storage-based death License: GPL-2.0+ ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.VF8ZRG/_old 2018-03-19 23:38:26.745207166 +0100 +++ /var/tmp/diff_new_pack.VF8ZRG/_new 2018-03-19 23:38:26.745207166 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ClusterLabs/sbd.git</param> - <param name="changesrevision">cc3e4cb7ac402a33a1e8996e3246589633b54871</param> + <param name="changesrevision">fa6b9ea42c8c4680d0bc44583c6bfd801f5f179b</param> </service> </servicedata> \ No newline at end of file ++++++ sbd-1.3.1+20180202.cc3e4cb.tar.xz -> sbd-1.3.1+20180316.8873890.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.3.1+20180202.cc3e4cb/.copr/Makefile new/sbd-1.3.1+20180316.8873890/.copr/Makefile --- old/sbd-1.3.1+20180202.cc3e4cb/.copr/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/sbd-1.3.1+20180316.8873890/.copr/Makefile 2018-03-16 21:46:08.000000000 +0100 @@ -0,0 +1,5 @@ +srpm: + dnf -y install git + make PACKAGE=sbd -f Makefile.am srpm + cp -v *.src.rpm $(outdir) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.3.1+20180202.cc3e4cb/.gitattributes new/sbd-1.3.1+20180316.8873890/.gitattributes --- old/sbd-1.3.1+20180202.cc3e4cb/.gitattributes 1970-01-01 01:00:00.000000000 +0100 +++ new/sbd-1.3.1+20180316.8873890/.gitattributes 2018-03-16 21:46:08.000000000 +0100 @@ -0,0 +1,2 @@ +/.* export-ignore + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.3.1+20180202.cc3e4cb/src/sbd-pacemaker.c new/sbd-1.3.1+20180316.8873890/src/sbd-pacemaker.c --- old/sbd-1.3.1+20180202.cc3e4cb/src/sbd-pacemaker.c 2018-02-02 10:47:49.000000000 +0100 +++ new/sbd-1.3.1+20180316.8873890/src/sbd-pacemaker.c 2018-03-16 21:46:08.000000000 +0100 @@ -109,6 +109,38 @@ return; } +static void +mon_retrieve_current_cib() +{ + xmlNode *xml_cib = NULL; + int options = cib_scope_local | cib_sync_call; + int rc = pcmk_ok; + + free_xml(current_cib); + current_cib = NULL; + + rc = cib->cmds->query(cib, NULL, &xml_cib, options); + + if (rc != pcmk_ok) { + crm_err("Couldn't retrieve the CIB: %s (%d)", pcmk_strerror(rc), rc); + free_xml(xml_cib); + return; + + } else if (xml_cib == NULL) { + crm_err("Couldn't retrieve the CIB: empty result"); + return; + } + + if (safe_str_eq(crm_element_name(xml_cib), XML_TAG_CIB)) { + current_cib = xml_cib; + + } else { + free_xml(xml_cib); + } + + return; +} + static gboolean mon_timer_notify(gpointer data) { @@ -121,8 +153,7 @@ if (cib_connected) { if (counter == counter_max) { - free_xml(current_cib); - current_cib = get_cib_copy(cib); + mon_retrieve_current_cib(); mon_refresh_state(NULL); counter = 0; } else { @@ -163,7 +194,7 @@ return rc; } - current_cib = get_cib_copy(cib); + mon_retrieve_current_cib(); mon_refresh_state(NULL); if (full) { @@ -308,7 +339,7 @@ } if (current_cib == NULL) { - current_cib = get_cib_copy(cib); + mon_retrieve_current_cib(); } /* Refresh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.3.1+20180202.cc3e4cb/src/sbd.service.in new/sbd-1.3.1+20180316.8873890/src/sbd.service.in --- old/sbd-1.3.1+20180202.cc3e4cb/src/sbd.service.in 2018-02-02 10:47:49.000000000 +0100 +++ new/sbd-1.3.1+20180316.8873890/src/sbd.service.in 2018-03-16 21:46:08.000000000 +0100 @@ -1,5 +1,6 @@ [Unit] Description=Shared-storage based fencing daemon +Documentation=man:sbd(8) Before=pacemaker.service Before=dlm.service After=systemd-modules-load.service iscsi.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.3.1+20180202.cc3e4cb/src/sbd_remote.service.in new/sbd-1.3.1+20180316.8873890/src/sbd_remote.service.in --- old/sbd-1.3.1+20180202.cc3e4cb/src/sbd_remote.service.in 2018-02-02 10:47:49.000000000 +0100 +++ new/sbd-1.3.1+20180316.8873890/src/sbd_remote.service.in 2018-03-16 21:46:08.000000000 +0100 @@ -1,5 +1,6 @@ [Unit] Description=Shared-storage based fencing daemon on pacemaker remote node +Documentation=man:sbd(8) After=systemd-modules-load.service iscsi.service PartOf=pacemaker_remote.service RefuseManualStop=true
