Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libdlm.17261 for openSUSE:Leap:15.2:Update checked in at 2021-12-13 12:06:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2:Update/libdlm.17261 (Old) and /work/SRC/openSUSE:Leap:15.2:Update/.libdlm.17261.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdlm.17261" Mon Dec 13 12:06:04 2021 rev:1 rq:939029 version:4.0.9 Changes: -------- New Changes file: --- /dev/null 2021-12-09 00:52:20.582305468 +0100 +++ /work/SRC/openSUSE:Leap:15.2:Update/.libdlm.17261.new.2520/libdlm.changes 2021-12-13 12:06:04.509297695 +0100 @@ -0,0 +1,482 @@ +------------------------------------------------------------------- +Wed Oct 14 11:04:44 UTC 2020 - Jan Engelhardt <jeng...@inai.de> + +- Do build with SUSE's %optflags. +- Abolish historic specfile constructs. +- Rework libdlm3 require with a shared library version + tag instead so it propagates to all consuming packages. + +------------------------------------------------------------------- +Wed Oct 14 10:10:20 UTC 2020 - g...@suse.com + +- Add require libdlm3 (bsc#1177658) + +------------------------------------------------------------------- +Mon Sep 21 11:10:20 UTC 2020 - g...@suse.com + +- Add dependency relationship between libdlm and dlm-kmp (bsc#1121380) + +------------------------------------------------------------------- +Tue Sep 15 10:30:20 UTC 2020 - g...@suse.com + +- Add notes in dlm.conf man page (bsc#1175812) + * add dlm_controld-add-note-that-the-dlm-file-is-not-creat.patch + +------------------------------------------------------------------- +Fri May 15 08:10:20 UTC 2020 - g...@suse.com + +- Support uint64_t corosync ringid (bsc#1168771) + * add cluster-ringid-seq.patch + +------------------------------------------------------------------- +Mon Aug 5 09:16:31 UTC 2019 - g...@suse.com + +- Update to v4.0.9 + * include some fixes/enhancements for dlm_controld (bsc#1144793) + * source moved to https://pagure.io/dlm + * drop 0004-bsc#1098449-dlm_stonith-explicitly-use-libstonithd.patch + +------------------------------------------------------------------- +Thu Nov 15 10:40:59 UTC 2018 - y...@suse.com + +- Explicitly use and link libstonithd from libpacemaker3 (bsc#1098449) + * 0004-bsc#1098449-dlm_stonith-explicitly-use-libstonithd.patch + +------------------------------------------------------------------- +Mon Aug 6 11:01:48 UTC 2018 - sch...@suse.de + +- sysmacros.patch: Include <sys/sysmacros.h> for minor + +------------------------------------------------------------------- +Thu Nov 23 13:48:46 UTC 2017 - rbr...@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- +Tue Feb 14 09:04:32 UTC 2017 - jeng...@inai.de + +- Use source URL; drop redundant %clean section; + rectify RPM groups; run fdupes to merge duplicate files. + +------------------------------------------------------------------- +Sat Feb 4 07:26:02 UTC 2017 - z...@suse.com + +- Update to v4.0.7 + * bsc#1023595: libdlm: upgrade version to 4.0.7 +- Re-add the dropped bsc numbers to follow the factory-first policy + * take Factory fixes for SLE12 (boo#944795, bsc#944797) + +------------------------------------------------------------------- +Mon Jul 25 06:54:31 UTC 2016 - z...@suse.com + +- Update to v4.0.6 + * In v4.0.4, there's a stupid and severe bug so that upstream + released v4.0.5 soon with an urgent fix + * Upstream merged our fix for bsc#977201 with release v4.0.6, + so I still use the 2 below bugs for this updates: + * bsc#967332: libdlm: package update to v4.0.4 + * bsc#977201: output of `dlm_tool ls` should distinguish causes + for "wait fencing" message + +- Drop patches + * bnc#875122dlm_controld-fix-long-name-in-log-entry.patch + * build-dlm_stonith.patch + +- Rename patches more readable + * remove: Makefile-for-diff-arch.patch, remove-sd-notify.patch, + bnc#874705nodes-without-quorum.patch + * add: 0001-makefile-for-diff-arch.patch, + 0002-remove-sd-notify.patch, + 0003-bnc#874705-nodes-without-quorum.patch + + +------------------------------------------------------------------- +Mon Feb 15 06:15:03 UTC 2016 - z...@suse.com + +- Update to V4.0.4 + * Remove build-dlm_stonith.patch + * Reove bnc#875122dlm_controld-fix-long-name-in-log-entry.patch + +------------------------------------------------------------------- +Fri May 1 16:41:52 UTC 2015 - jeng...@inai.de + +- Avoid running sh for %post ldconfig +- Default to implicit -n for %setup + +------------------------------------------------------------------- +Sun Apr 12 16:30:46 UTC 2015 - crrodrig...@opensuse.org + +- Move udev rules to %{_udevrulesdir}, packages should + not ship files in /etc/udev/rules.d which is reserved + for the sysadmin. + +------------------------------------------------------------------- +Fri Nov 14 08:33:11 UTC 2014 - dims...@opensuse.org + +- BuildRequire pkgconfig(systemd) instead of systemd-devel. + +------------------------------------------------------------------- +Wed May 21 11:34:53 UTC 2014 - jseg...@novell.com + +- added necessary macros for systemd files + +------------------------------------------------------------------- +Tue May 20 08:06:58 UTC 2014 - lzh...@suse.com + +- fix different behavior when nodes without quorum + + bnc#874705nodes-without-quorum.patch + +------------------------------------------------------------------- +Mon Apr 28 02:36:41 UTC 2014 - lzh...@suse.com + +- dlm_controld print out error format message(bnc#875122) + + bnc#875122dlm_controld-fix-long-name-in-log-entry.patch + +------------------------------------------------------------------- +Mon Mar 31 06:12:40 UTC 2014 - lzh...@suse.com + +- dlm_controld notifies systemd(bnc#870626) + + remove-sd-notify.patch + +------------------------------------------------------------------- +Sat Sep 7 09:40:54 CDT 2013 - rgold...@suse.com + +- Build dlm_stonith to prox fencing for pacemaker + + build-dlm_stonith.patch +- Remove patch to use default fscontrol using sysconfig + - libdlm-enable-fscontrol.patch + +------------------------------------------------------------------- +Thu Aug 1 04:33:51 UTC 2013 - lzh...@suse.com + +- Update to V4.0.2 + +------------------------------------------------------------------- +Tue Jul 23 01:44:05 UTC 2013 - lzh...@suse.com + +- Update to V4.0.1(openSuse13.1) + + file a patch for opensuse build service +- Remove patches from sle11sp3 for either merged in the upstream + or obsoleted. + - bnc804707-reduce-RR-priority.patch + - bnc777137-fix-plock-dev_write_no_op.patch + - libdlm-gcc47.patch + - libdlm-pacemaker.patch + +------------------------------------------------------------------- +Mon Jun 24 07:59:44 UTC 2013 - y...@suse.com + +- dl_controld: libdlm-pacemaker.patch + * Replace use of send_ais_text() with send_cluster_text() + * Replace use of ais_dispatch() with plugin_dispatch() + * Replace use of crm_peer_id_cache with crm_peer_cache + +------------------------------------------------------------------- +Mon May 27 08:14:43 UTC 2013 - tser...@suse.com + +- Replace NAME= with SYMLINK+= in udev rules (bnc#779718) + + use-symlink-in-udev-rules.patch + +------------------------------------------------------------------- +Thu Mar 28 09:50:01 UTC 2013 - dmzh...@suse.com + +- reduce dlm_controld priority to RR(1). (bnc#804707) + +------------------------------------------------------------------- +Fri Feb 22 18:16:54 UTC 2013 - l...@suse.com + +- Make sure we poll the right fd for AIS notifications to avoid spinning + (bnc#803746) + +------------------------------------------------------------------- +Mon Jan 28 14:48:07 UTC 2013 - co...@suse.com + +- small cleanup of spec file + +------------------------------------------------------------------- ++++ 285 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Leap:15.2:Update/.libdlm.17261.new.2520/libdlm.changes New: ---- 0001-makefile-for-diff-arch.patch 0002-remove-sd-notify.patch 0003-bnc#874705-nodes-without-quorum.patch cluster-ringid-seq.patch dlm-4.0.9.tar.gz dlm_controld-add-note-that-the-dlm-file-is-not-creat.patch libdlm.changes libdlm.spec sysmacros.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdlm.spec ++++++ # # spec file for package libdlm # # Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir /var/adm/fillup-templates %endif %if 0%{?suse_version} %define _libexecdir %{_libdir} %endif %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} %define pkg_group System Environment/Daemons %else %define pkg_group Productivity/Clustering/HA %endif Name: libdlm Summary: Application interface to the kernel's distributed lock manager License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Clustering/HA Version: 4.0.9 Release: 0 URL: https://pagure.io/dlm/ Source: https://releases.pagure.org/dlm/dlm-%{version}.tar.gz Patch1: 0001-makefile-for-diff-arch.patch Patch2: 0002-remove-sd-notify.patch Patch3: 0003-bnc#874705-nodes-without-quorum.patch Patch4: sysmacros.patch Patch5: cluster-ringid-seq.patch Patch6: dlm_controld-add-note-that-the-dlm-file-is-not-creat.patch BuildRequires: fdupes BuildRequires: glib2-devel BuildRequires: libcorosync-devel BuildRequires: libpacemaker-devel BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) Recommends: dlm-kmp %description Libraries and tools that allow applications, particularly filesystems like OCFS2, to interface with the in-kernel distributed lock manager. %package -n libdlm3 Summary: Application interface to the kernel's distributed lock manager # libdlm2 (openSUSE 11.2) also contained libdlm*.so.3 License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Libraries Obsoletes: libdlm2 Conflicts: libdlm2 %description -n libdlm3 Libraries and tools that allow applications, particularly filesystems like OCFS2, to interface with the in-kernel distributed lock manager. %package devel Summary: Development files for the kernel's distributed lock manager License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Requires: libdlm3 = %{version} %description devel Libraries and tools that allow applications, particularly filesystems like OCFS2, to interface with the in-kernel distributed lock manager. %prep %autosetup -p1 -n dlm-%{version} %build echo "V_%version { global: *; };" >dlm.ver export CFLAGS="%optflags" export LDFLAGS="-Wl,--version-script=$PWD/dlm.ver" make all UDEVDIR="%{_udevrulesdir}" ########################################################### %install ########################################################### %make_install UDEVDIR="%{_udevrulesdir}" mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/packages/libdlm-%{version} install -Dm 0644 init/dlm.service $RPM_BUILD_ROOT%{_unitdir}/dlm.service install -Dm 0644 init/dlm.sysconfig $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.dlm %fdupes %{buildroot}/%{_prefix} ########################################################### %post %fillup_only -n dlm %{?udev_rules_update} %service_add_post dlm.service %preun %service_del_preun dlm.service %pre %service_add_pre dlm.service %postun %service_del_postun dlm.service %post -n libdlm3 -p /sbin/ldconfig %postun -n libdlm3 -p /sbin/ldconfig %files %dir %{_datadir}/doc/packages/libdlm-%{version} %{_udevrulesdir}/51-dlm.rules %{_sbindir}/dlm_controld %{_sbindir}/dlm_stonith %{_sbindir}/dlm_tool %{_datadir}/man/man8/*.gz %{_datadir}/man/man3/*.gz %{_datadir}/man/man5/*.gz %{_datadir}/doc/packages/libdlm-%{version} %{_unitdir}/dlm.service %{_fillupdir}/sysconfig.dlm %files -n libdlm3 %{_libdir}/libdlm.so.* %{_libdir}/libdlm_lt.so.* %{_libdir}/libdlmcontrol.so.* %files devel %{_libdir}/libdlm*.so %{_libdir}/pkgconfig/libdlm.pc %{_libdir}/pkgconfig/libdlm_lt.pc %{_libdir}/pkgconfig/libdlmcontrol.pc %{_includedir}/libdlm.h %{_includedir}/libdlmcontrol.h %changelog ++++++ 0001-makefile-for-diff-arch.patch ++++++ Index: a/dlm_controld/Makefile =================================================================== --- a/dlm_controld/Makefile +++ b/dlm_controld/Makefile @@ -1,6 +1,11 @@ DESTDIR= PREFIX=/usr -LIBNUM=/lib64 +cpu_bit=$(shell getconf LONG_BIT) +ifeq ($(cpu_bit),64) + LIBNUM=/lib64 +else + LIBNUM=/lib +endif BINDIR=$(PREFIX)/sbin LIBDIR=$(PREFIX)/$(LIBNUM) HDRDIR=$(PREFIX)/include Index: libdlm-4.0.2/libdlm/Makefile =================================================================== --- libdlm-4.0.2.orig/libdlm/Makefile +++ libdlm-4.0.2/libdlm/Makefile @@ -1,6 +1,11 @@ DESTDIR= PREFIX=/usr -LIBNUM=/lib64 +cpu_bit=$(shell getconf LONG_BIT) +ifeq ($(cpu_bit),64) + LIBNUM=/lib64 +else + LIBNUM=/lib +endif LIBDIR=$(PREFIX)/$(LIBNUM) HDRDIR=$(PREFIX)/include MANDIR=$(PREFIX)/share/man ++++++ 0002-remove-sd-notify.patch ++++++ Index: a/dlm_controld/Makefile =================================================================== --- a/dlm_controld/Makefile +++ b/dlm_controld/Makefile @@ -6,7 +6,7 @@ LIBDIR=$(PREFIX)/$(LIBNUM) MANDIR=$(PREFIX)/share/man PKGDIR=$(LIBDIR)/pkgconfig -USE_SD_NOTIFY=yes +USE_SD_NOTIFY=no BIN_TARGET = dlm_controld ++++++ 0003-bnc#874705-nodes-without-quorum.patch ++++++ Index: libdlm-4.0.2/dlm_controld/cpg.c =================================================================== --- libdlm-4.0.2.orig/dlm_controld/cpg.c +++ libdlm-4.0.2/dlm_controld/cpg.c @@ -1261,6 +1261,19 @@ void process_lockspace_changes(void) poll_fs = 0; list_for_each_entry_safe(ls, safe, &lockspaces, list) { + if (ls->leaving && !(opt(enable_quorum_lockspace_ind) + && !cluster_quorate)) { + log_group(ls, "confchg for our leave"); + stop_kernel(ls, 0); + set_configfs_members(ls, ls->name, 0, NULL, 0, NULL); + set_sysfs_event_done(ls->name, 0); + cpg_finalize(ls->cpg_handle); + client_dead(ls->cpg_client); + purge_plocks(ls, our_nodeid, 1); + list_del(&ls->list); + free_ls(ls); + return; + } if (!list_empty(&ls->changes)) apply_changes(ls); } @@ -1414,7 +1427,10 @@ static void confchg_cb(cpg_handle_t hand return; } - if (ls->leaving && we_left(left_list, left_list_entries)) { + /*check currently if we have quorum in order to keep the + same behavior with other nodes*/ + if (ls->leaving && we_left(left_list, left_list_entries) + && !(opt(enable_quorum_lockspace_ind) && !cluster_quorate)) { /* we called cpg_leave(), and this should be the final cpg callback we receive */ log_group(ls, "confchg for our leave"); ++++++ cluster-ringid-seq.patch ++++++ diff --git a/dlm_controld/cpg.c b/dlm_controld/cpg.c index e4b27fac3cd5..5b5c52fc09bc 100644 --- a/dlm_controld/cpg.c +++ b/dlm_controld/cpg.c @@ -450,21 +450,24 @@ static int check_ringid_done(struct lockspace *ls) but that's probably not guaranteed.) */ if (ls->cpg_ringid_wait) { - log_group(ls, "check_ringid wait cluster %u cpg %u:%llu", - cluster_ringid_seq, ls->cpg_ringid.nodeid, + log_group(ls, "check_ringid wait cluster %u cpg %llu:%llu", + (unsigned long long)cluster_ringid_seq, + ls->cpg_ringid.nodeid, (unsigned long long)ls->cpg_ringid.seq); return 0; } - if (cluster_ringid_seq != (uint32_t)ls->cpg_ringid.seq) { - log_group(ls, "check_ringid cluster %u cpg %u:%llu", - cluster_ringid_seq, ls->cpg_ringid.nodeid, + if (cluster_ringid_seq != ls->cpg_ringid.seq) { + log_group(ls, "check_ringid cluster %llu cpg %u:%llu", + (unsigned long long)cluster_ringid_seq, + ls->cpg_ringid.nodeid, (unsigned long long)ls->cpg_ringid.seq); return 0; } - log_limit(ls, "check_ringid done cluster %u cpg %u:%llu", - cluster_ringid_seq, ls->cpg_ringid.nodeid, + log_limit(ls, "check_ringid done cluster %llu cpg %u:%llu", + (unsigned long long)cluster_ringid_seq, + ls->cpg_ringid.nodeid, (unsigned long long)ls->cpg_ringid.seq); return 1; diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h index 3221e19cb7be..5b9a52dae750 100644 --- a/dlm_controld/dlm_daemon.h +++ b/dlm_controld/dlm_daemon.h @@ -179,7 +179,7 @@ EXTERN uint64_t fence_delay_begin; EXTERN uint64_t cluster_quorate_monotime; EXTERN uint64_t cluster_joined_monotime; EXTERN uint64_t cluster_joined_walltime; -EXTERN uint32_t cluster_ringid_seq; +EXTERN uint64_t cluster_ringid_seq; EXTERN char cluster_name[DLM_LOCKSPACE_LEN+1]; EXTERN int our_nodeid; EXTERN uint32_t control_minor; diff --git a/dlm_controld/member.c b/dlm_controld/member.c index 10351ec41d6d..da3a1f5b0e90 100644 --- a/dlm_controld/member.c +++ b/dlm_controld/member.c @@ -122,10 +122,10 @@ static void quorum_callback(quorum_handle_t h, uint32_t quorate, cluster_quorate_monotime = now; cluster_quorate = quorate; - cluster_ringid_seq = (uint32_t)ring_seq; + cluster_ringid_seq = ring_seq; - log_debug("cluster quorum %u seq %u nodes %u", - cluster_quorate, cluster_ringid_seq, node_list_entries); + log_debug("cluster quorum %u seq %llu nodes %u", + cluster_quorate, (unsigned long long)cluster_ringid_seq, node_list_entries); old_node_count = quorum_node_count; memcpy(&old_nodes, &quorum_nodes, sizeof(old_nodes)); @@ -139,8 +139,8 @@ static void quorum_callback(quorum_handle_t h, uint32_t quorate, for (i = 0; i < old_node_count; i++) { if (!is_cluster_member(old_nodes[i])) { - log_debug("cluster node %u removed seq %u", - old_nodes[i], cluster_ringid_seq); + log_debug("cluster node %u removed seq %llu", + old_nodes[i], (unsigned long long)cluster_ringid_seq); rem_cluster_node(old_nodes[i], now); del_configfs_node(old_nodes[i]); } @@ -148,8 +148,8 @@ static void quorum_callback(quorum_handle_t h, uint32_t quorate, for (i = 0; i < quorum_node_count; i++) { if (!is_old_member(quorum_nodes[i])) { - log_debug("cluster node %u added seq %u", - quorum_nodes[i], cluster_ringid_seq); + log_debug("cluster node %u added seq %llu", + quorum_nodes[i], (unsigned long long)cluster_ringid_seq); add_cluster_node(quorum_nodes[i], now); fence_delay_begin = now; ++++++ dlm_controld-add-note-that-the-dlm-file-is-not-creat.patch ++++++ >From 74595a9400f20c4d4fd83c0a748ddb875d39f578 Mon Sep 17 00:00:00 2001 From: Gang He <g...@suse.com> Date: Mon, 14 Sep 2020 15:51:01 +0800 Subject: [PATCH] dlm_controld: add note that the dlm file is not created /etc/dlm/dlm.conf file is not created during installation. we need to tell the user this configuration file does not exist. Signed-off-by: Gang He <g...@suse.com> --- dlm_controld/dlm.conf.5 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlm_controld/dlm.conf.5 b/dlm_controld/dlm.conf.5 index 1ce0c644..78ac22c0 100644 --- a/dlm_controld/dlm.conf.5 +++ b/dlm_controld/dlm.conf.5 @@ -411,6 +411,12 @@ node id=1 mark=42 In which case node 1 will master 2/3 of the total resources and node 2 will master the other 1/3. +.SH NOTES +.B /etc/dlm/dlm.conf +file is not created during installation. +.br +If you want to modify any default configuration items, you need to create and edit the file. + .SH SEE ALSO .BR dlm_controld (8), .BR dlm_tool (8) -- 2.12.3 ++++++ sysmacros.patch ++++++ Index: dlm-4.0.7/dlm_controld/action.c =================================================================== --- dlm-4.0.7.orig/dlm_controld/action.c +++ dlm-4.0.7/dlm_controld/action.c @@ -7,6 +7,7 @@ */ #include "dlm_daemon.h" +#include <sys/sysmacros.h> #include <corosync/corotypes.h> #include <corosync/cmap.h> Index: dlm-4.0.7/libdlm/libdlm.c =================================================================== --- dlm-4.0.7.orig/libdlm/libdlm.c +++ dlm-4.0.7/libdlm/libdlm.c @@ -11,6 +11,7 @@ #include <pthread.h> #endif #include <sys/types.h> +#include <sys/sysmacros.h> #include <sys/ioctl.h> #include <sys/param.h> #include <sys/stat.h>
