Hello community, here is the log from the commit of package libdlm for openSUSE:Factory checked in at 2017-02-08 12:06:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdlm (Old) and /work/SRC/openSUSE:Factory/.libdlm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdlm" Changes: -------- --- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes 2016-08-03 11:38:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2017-02-08 12:06:31.461906375 +0100 @@ -1,0 +2,6 @@ +Sat Feb 4 07:26:02 UTC 2017 - [email protected] + +- Update to v4.0.7 + * bsc#1023595: libdlm: upgrade version to 4.0.7 + +------------------------------------------------------------------- Old: ---- libdlm-4.0.6.tar.gz New: ---- libdlm-4.0.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdlm.spec ++++++ --- /var/tmp/diff_new_pack.QgnHGf/_old 2017-02-08 12:06:32.373777765 +0100 +++ /var/tmp/diff_new_pack.QgnHGf/_new 2017-02-08 12:06:32.373777765 +0100 @@ -1,7 +1,7 @@ # # spec file for package libdlm # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,10 +29,10 @@ Summary: Application interface to the kernel's distributed lock manager License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA -Version: 4.0.6 +Version: 4.0.7 Release: 0 Url: http://sources.redhat.com/cluster/wiki -Source: libdlm-4.0.6.tar.gz +Source: libdlm-4.0.7.tar.gz Patch1: 0001-makefile-for-diff-arch.patch Patch2: 0002-remove-sd-notify.patch Patch3: 0003-bnc#874705-nodes-without-quorum.patch ++++++ libdlm-4.0.6.tar.gz -> libdlm-4.0.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdlm-4.0.6/dlm_controld/Makefile new/libdlm-4.0.7/dlm_controld/Makefile --- old/libdlm-4.0.6/dlm_controld/Makefile 2016-06-10 18:36:25.000000000 +0200 +++ new/libdlm-4.0.7/dlm_controld/Makefile 2016-12-19 16:01:53.000000000 +0100 @@ -62,9 +62,9 @@ LIB_LDFLAGS += -Wl,-z,relro -pie ifeq ($(USE_SD_NOTIFY),yes) - BIN_CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) \ + BIN_CFLAGS += $(shell pkg-config --cflags libsystemd) \ -DUSE_SD_NOTIFY - BIN_LDFLAGS += $(shell pkg-config --libs libsystemd-daemon) + BIN_LDFLAGS += $(shell pkg-config --libs libsystemd) endif all: $(LIB_TARGET) $(BIN_TARGET) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdlm-4.0.6/dlm_controld/daemon_cpg.c new/libdlm-4.0.7/dlm_controld/daemon_cpg.c --- old/libdlm-4.0.6/dlm_controld/daemon_cpg.c 2016-06-10 18:36:25.000000000 +0200 +++ new/libdlm-4.0.7/dlm_controld/daemon_cpg.c 2016-12-19 16:01:53.000000000 +0100 @@ -79,6 +79,7 @@ int fence_actor_done; /* for status/debug */ int fence_actor_last; /* for status/debug */ int fence_actors[MAX_NODES]; + int fence_actors_orig[MAX_NODES]; struct protocol proto; struct fence_config fence_config; @@ -537,6 +538,7 @@ int i, nodeid, count = 0, low = 0; memset(node->fence_actors, 0, sizeof(node->fence_actors)); + memset(node->fence_actors_orig, 0, sizeof(node->fence_actors_orig)); for (i = 0; i < daemon_member_count; i++) { nodeid = daemon_member[i].nodeid; @@ -550,6 +552,9 @@ low = nodeid; } + /* keep a copy of the original set so they can be retried if all fail */ + memcpy(node->fence_actors_orig, node->fence_actors, sizeof(node->fence_actors)); + log_debug("set_fence_actors for %d low %d count %d", node->nodeid, low, count); return low; @@ -592,6 +597,7 @@ static void clear_fence_actor(int nodeid, int actor) { struct node_daemon *node; + int remaining = 0; int i; node = get_node_daemon(nodeid); @@ -599,10 +605,15 @@ return; for (i = 0; i < MAX_NODES; i++) { - if (node->fence_actors[i] == actor) { + if (node->fence_actors[i] == actor) node->fence_actors[i] = 0; - return; - } + else if (node->fence_actors[i]) + remaining++; + } + + if (!remaining && opt(repeat_failed_fencing_ind)) { + log_debug("clear_fence_actor %d restoring original actors to retry", actor); + memcpy(node->fence_actors, node->fence_actors_orig, sizeof(node->fence_actors)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdlm-4.0.6/dlm_controld/dlm.conf.5 new/libdlm-4.0.7/dlm_controld/dlm.conf.5 --- old/libdlm-4.0.6/dlm_controld/dlm.conf.5 2016-06-10 18:36:25.000000000 +0200 +++ new/libdlm-4.0.7/dlm_controld/dlm.conf.5 2016-12-19 16:01:53.000000000 +0100 @@ -68,6 +68,8 @@ .br enable_quorum_lockspace .br +repeat_failed_fencing +.br .SH Fencing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdlm-4.0.6/dlm_controld/dlm_controld.8 new/libdlm-4.0.7/dlm_controld/dlm_controld.8 --- old/libdlm-4.0.6/dlm_controld/dlm_controld.8 2016-06-10 18:36:25.000000000 +0200 +++ new/libdlm-4.0.7/dlm_controld/dlm_controld.8 2016-12-19 16:01:53.000000000 +0100 @@ -87,6 +87,10 @@ 0|1 enable/disable quorum requirement for lockspace operations +.B --repeat_failed_fencing +0|1 + enable/disable retrying after fencing fails + .B --fence_all .I str fence all nodes with this agent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdlm-4.0.6/dlm_controld/dlm_daemon.h new/libdlm-4.0.7/dlm_controld/dlm_daemon.h --- old/libdlm-4.0.6/dlm_controld/dlm_daemon.h 2016-06-10 18:36:25.000000000 +0200 +++ new/libdlm-4.0.7/dlm_controld/dlm_daemon.h 2016-12-19 16:01:53.000000000 +0100 @@ -106,6 +106,7 @@ enable_fencing_ind, enable_concurrent_fencing_ind, enable_startup_fencing_ind, + repeat_failed_fencing_ind, enable_quorum_fencing_ind, enable_quorum_lockspace_ind, help_ind, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdlm-4.0.6/dlm_controld/main.c new/libdlm-4.0.7/dlm_controld/main.c --- old/libdlm-4.0.6/dlm_controld/main.c 2016-06-10 18:36:25.000000000 +0200 +++ new/libdlm-4.0.7/dlm_controld/main.c 2016-12-19 16:01:53.000000000 +0100 @@ -1346,6 +1346,11 @@ 1, NULL, "enable/disable startup fencing"); + set_opt_default(repeat_failed_fencing_ind, + "repeat_failed_fencing", '\0', req_arg_bool, + 1, NULL, + "enable/disable retrying after fencing fails"); + set_opt_default(enable_quorum_fencing_ind, "enable_quorum_fencing", 'q', req_arg_bool, 1, NULL, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdlm-4.0.6/include/version.cf new/libdlm-4.0.7/include/version.cf --- old/libdlm-4.0.6/include/version.cf 2016-06-10 18:36:25.000000000 +0200 +++ new/libdlm-4.0.7/include/version.cf 2016-12-19 16:01:53.000000000 +0100 @@ -1,6 +1,6 @@ #ifndef _RELEASE_VERSION_CF_ #define _RELEASE_VERSION_CF_ -#define RELEASE_VERSION "4.0.6" +#define RELEASE_VERSION "4.0.7" #endif
