Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory
checked in at Tue Jun 29 17:17:20 CEST 2010.
--------
--- libdlm/libdlm.changes 2009-03-13 17:34:43.000000000 +0100
+++ libdlm/libdlm.changes 2010-06-25 06:49:19.000000000 +0200
@@ -1,0 +2,128 @@
+Mon Jun 14 15:16:06 UTC 2010 - lmb@novell.com
+
+- Allow libdlm to compile with new pacemaker version.
+
+-------------------------------------------------------------------
+Tue May 18 01:46:52 UTC 2010 - tserong@novell.com
+
+- Reverted libdlm-bug-603685-v2.diff (bug now fixed in Pacemaker)
+
+-------------------------------------------------------------------
+Fri May 14 12:54:48 UTC 2010 - lmb@novell.com
+
+- libdlm-bug-603685-v2.diff: fix dlm_controld.pcmk member processing
+ (bnc#603685)
+
+-------------------------------------------------------------------
+Mon Apr 26 16:00:24 UTC 2010 - coly.li@suse.de
+
+- update from upstream (cs fae6ee39)
+ - dlm_controld: don't log errors after disabling plocks
+ - dlm_controld: don't skip unlinking checkpoint
+ - dlm_controld: set last_plock_time for ownership operations
+ - dlm_controld: add plock checkpoint signatures
+ - dlm_controld: check all messages against enable options
+ - dlm_controld: avoid full plock unlock when no resource exists
+
+-------------------------------------------------------------------
+Wed Mar 24 18:34:58 UTC 2010 - coyli@novell.com
+
+- update from upstream:
+ - dlm_controld: set rmem for sctp
+ - misc: update copyright year and owners
+ - man pages: dlm_tool and dlm_controld
+ - dlm_controld/libdlmcontrol/dlm_tool: separate plock debug buffer
+ - dlm_controld: add more fs_notified debugging
+
+-------------------------------------------------------------------
+Fri Feb 5 10:22:31 UTC 2010 - coyli@novell.com
+
+- delete 64bytes_lvb_len.diff (bnc#573460)
+
+-------------------------------------------------------------------
+Wed Jan 27 09:32:49 UTC 2010 - lmb@novell.com
+
+- Remove libdlm2 on upgrade.
+
+-------------------------------------------------------------------
+Tue Dec 8 06:35:06 UTC 2009 - coyli@novell.com
+
+- 64bytes_lvb_len.diff: change DLM_LVB_LEN to 64 bytes (bnc#515645)
+
+-------------------------------------------------------------------
+Wed Dec 2 08:35:31 UTC 2009 - coyli@novell.com
+
+- remove already-in-upstream patches from package
+
+-------------------------------------------------------------------
+Wed Dec 2 07:44:08 UTC 2009 - coyli@novell.com
+
+- update to upstream commit 7ad436ba4a7d68a79510fd6c033568b6bb100191.
+ not pass compiling yet
+
+-------------------------------------------------------------------
+Thu Nov 26 18:31:24 UTC 2009 - coyli@novell.com
+
+- upgrade package version number from 2.99.08 to 3.00.01, no code
+ modified.
+
+-------------------------------------------------------------------
+Tue Sep 29 06:54:06 UTC 2009 - "lmb@novell.com"
+
+- libdlm-lockspace-fs_notify.diff: fix a race which could lead to an
+ infinite logging loop (bnc#532406).
+
+-------------------------------------------------------------------
+Tue Sep 22 14:19:50 UTC 2009 - "lmb@novell.com"
+
+- dlm-no-quorum-default.diff: change quorum handling to allow cluster to
+ shutdown nodes one-by-one (bnc#541042).
+
+-------------------------------------------------------------------
+Thu Sep 3 09:25:51 UTC 2009 - "lmb@novell.com"
+
+- dlm-debug.diff: Include the lockspace name in syslog().
+
+-------------------------------------------------------------------
+Thu Aug 27 16:14:16 UTC 2009 - "lmb@novell.com"
+
+- dlm-plock-optimization.diff: allow plocks to revert back to single
+ node mode (bnc#497176).
+
+-------------------------------------------------------------------
+Mon Aug 10 17:48:27 UTC 2009 - lmb@novell.com
+
+- libdlm-lockspace-recovery.patch: ensure that all lock spaces are
+ recovered (bnc#528425).
+
+-------------------------------------------------------------------
+Wed Jul 29 16:20:24 CST 2009 - coly.li@suse.de
+
+- add ocfs2-kmp to libdlm requires, since fs/dlm will be integrated
+ into ocfs2-kmp.
+
+-------------------------------------------------------------------
+Tue Jul 21 15:10:39 CEST 2009 - lmb@novell.com
+
+- Fix compilation with new pacemaker code.
+
+-------------------------------------------------------------------
+Tue Mar 31 15:08:36 CEST 2009 - abeekhof@suse.de
+
+- Update for HAE11-RC9
+- Bug bnc#490418 - Reduce the amount of logging while waiting for nodes to be shot
+
+-------------------------------------------------------------------
+Fri Mar 20 12:12:41 CET 2009 - abeekhof@suse.de
+
+- Split the SUSE specific patch from the parts that have
+ been submitted upstream
+- Correctly log the result of calls to crm_terminate_member_no_mainloop()
+
+-------------------------------------------------------------------
+Thu Mar 19 13:38:25 CET 2009 - abeekhof@suse.de
+
+- Fix race condition when creating configfs entries for
+ cluster peers
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libdlm.tar.gz
pacemaker.diff
New:
----
libdlm.tar.bz2
pcmk-crm_log_init.diff
sles-specific.diff
upstream-submissions.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libdlm.spec ++++++
--- /var/tmp/diff_new_pack.aj0l1J/_old 2010-06-29 17:16:12.000000000 +0200
+++ /var/tmp/diff_new_pack.aj0l1J/_new 2010-06-29 17:16:12.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package libdlm (Version 2.99.08)
+# spec file for package libdlm (Version 3.00.01)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,17 +31,19 @@
Name: libdlm
Summary: Application interface to the kernel's distributed lock manager
-Version: 2.99.08
-Release: 9
-License: GPL v2 only; GPL v2 or later; LGPL v2.1 or later
+Version: 3.00.01
+Release: 1
+License: GPLv2 ; GPLv2+ ; LGPLv2.1+
Url: http://sources.redhat.com/cluster/wiki
Group: Productivity/Clustering/HA
-Source: libdlm.tar.gz
-Patch1: pacemaker.diff
+Source: libdlm.tar.bz2
+Patch1: upstream-submissions.diff
+Patch2: sles-specific.diff
+Patch3: pcmk-crm_log_init.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on
Requires: pacemaker
-BuildRequires: glib2-devel kernel-source >= 2.6.26 libopenais-devel libpacemaker-devel libxml2-devel
+BuildRequires: glib2-devel kernel-source >= 2.6.26 libcorosync-devel libopenais-devel libpacemaker-devel libxml2-devel
%description
Libraries and tools that allows applications, particularly filesystems
@@ -82,15 +84,35 @@
Wendy Cheng
jparsons
-%package -n libdlm2
+%package -n libdlm3
Summary: Application interface to the kernel's distributed lock manager
-License: LGPL v2.1 or later
+License: GPLv2 ; GPLv2+ ; LGPLv2.1+
Group: Productivity/Clustering/HA
+Obsoletes: libdlm2
+Conflicts: libdlm2
-%description -n libdlm2
+%description -n libdlm3
Libraries and tools that allows applications, particularly filesystems
like OCFS2, to interface with the in-kernel distributed lock manager.
+Authors: A. J. Lewis Abhijith Das
+Adam Manthei Alasdair G. Kergon
+Andrew Price Benjamin Marzinski
+ Bob Peterson Chris Feist
+ Christine Caulfield Daniel
+Phillips David Teigland
+Fabio M. Di Nitto James Parsons
+ Joel Becker Jonathan
+Brassow Ken Preslan Lon
+Hohberger Marc - A. Dahlhaus Marek Grac
+ Mark Hlawatschek Michael
+Conrad Tadpol Tilstra Patrick Caulfield
+ Robert Peterson Ross
+Vandegrift Ryan McCabe Ryan
+O'Hara Stanko Kupcevic Steven
+Whitehouse Wendy Cheng
+jparsons
+
Authors:
@@ -127,10 +149,10 @@
jparsons
%package devel
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Summary: Application interface to the kernel's distributed lock manager
Group: Development/Libraries/C and C++
-Requires: libdlm2 = %{version}
+Requires: libdlm3 = %{version}
%description devel
Libraries and tools that allows applications, particularly filesystems
@@ -175,6 +197,8 @@
###########################################################
%setup -n libdlm
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
###########################################################
%build
@@ -199,11 +223,8 @@
CFLAGS="$CFLAGS -fgnu89-inline"
%endif
export CFLAGS
-./configure --prefix=%{_prefix} \
- --mandir=%{_mandir} --libdir=%{_libdir} \
- --without_bindings \
- --disable_kernel_check \
- --corosynclibdir=%{_libdir}/openais --enable_pacemaker
+./autogen.sh
+%configure --enable-pacemaker --disable-cman
export MAKE="make %{?jobs:-j%jobs}"
make %{?jobs:-j%jobs}
###########################################################
@@ -211,13 +232,9 @@
%install
###########################################################
make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/packages/libdlm-%{version}
-mv $RPM_BUILD_ROOT%{_datadir}/doc/{cluster,packages/libdlm-%{version}}/COPYING.applications
-mv $RPM_BUILD_ROOT%{_datadir}/doc/{cluster,packages/libdlm-%{version}}/COPYING.libraries
-mv $RPM_BUILD_ROOT%{_datadir}/doc/{cluster,packages/libdlm-%{version}}/COPYRIGHT
-mv $RPM_BUILD_ROOT%{_datadir}/doc/{cluster,packages/libdlm-%{version}}/README.licence
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/packages/
+mv $RPM_BUILD_ROOT%{_datadir}/doc/{dlm,packages/libdlm-%{version}}
# Cleanup
-[ -d $RPM_BUILD_ROOT/usr/man ] && rm -rf $RPM_BUILD_ROOT/usr/man
[ -d $RPM_BUILD_ROOT/usr/share/libtool ] && rm -rf $RPM_BUILD_ROOT/usr/share/libtool
find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f
find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f
@@ -232,9 +249,9 @@
fi
###########################################################
-%post -n libdlm2 -p /sbin/ldconfig
+%post -n libdlm3 -p /sbin/ldconfig
-%postun -n libdlm2 -p /sbin/ldconfig
+%postun -n libdlm3 -p /sbin/ldconfig
%files
###########################################################
@@ -248,9 +265,8 @@
%{_datadir}/man/man8/dlm_tool.8.gz
%{_datadir}/man/man8/dlm_controld.8.gz
%{_datadir}/doc/packages/libdlm-%{version}
-%exclude %{_datadir}/doc/cluster
-%files -n libdlm2
+%files -n libdlm3
%defattr(-,root,root)
%{_libdir}/libdlm.so.*
%{_libdir}/libdlm_lt.so.*
++++++ pcmk-crm_log_init.diff ++++++
Index: libdlm/group/dlm_controld/pacemaker.c
===================================================================
--- libdlm.orig/group/dlm_controld/pacemaker.c
+++ libdlm/group/dlm_controld/pacemaker.c
@@ -61,7 +61,7 @@ void dlm_process_node(gpointer key, gpoi
int setup_cluster(void)
{
ais_fd_async = -1;
- crm_log_init("cluster-dlm", LOG_INFO, FALSE, TRUE, 0, NULL);
+ crm_log_init("cluster-dlm", LOG_INFO, FALSE, TRUE, 0, NULL, FALSE);
if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) {
log_error("Connection to our AIS plugin (CRM) failed");
++++++ sles-specific.diff ++++++
Index: libdlm/group/dlm_controld/dlm_daemon.h
===================================================================
--- libdlm.orig/group/dlm_controld/dlm_daemon.h
+++ libdlm/group/dlm_controld/dlm_daemon.h
@@ -36,7 +36,7 @@
#include
#include
-#include
+#define logt_print(level, format, args...) syslog(level, "%s: " format "\n", __FUNCTION__, ##args)
#include
#include "libdlmcontrol.h"
Index: libdlm/group/dlm_controld/pacemaker.c
===================================================================
--- libdlm.orig/group/dlm_controld/pacemaker.c
+++ libdlm/group/dlm_controld/pacemaker.c
@@ -65,7 +65,7 @@ int setup_cluster(void)
crm_log_init("cluster-dlm", LOG_INFO, FALSE, TRUE, 0, NULL);
if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) {
- log_error("Connection to our AIS plugin (%d) failed", CRM_SERVICE);
+ log_error("Connection to our AIS plugin (CRM) failed");
return -1;
}
Index: libdlm/configure.ac
===================================================================
--- libdlm.orig/configure.ac
+++ libdlm/configure.ac
@@ -125,7 +125,6 @@ KERNEL_CPPFLAGS="-I$KERNEL_DIR/include"
PKG_CHECK_MODULES([corosync],[corosync])
PKG_CHECK_MODULES([cpg],[libcpg])
PKG_CHECK_MODULES([sackpt],[libSaCkpt])
-PKG_CHECK_MODULES([logt],[liblogthread])
if test "x${enable_pacemaker}" = xyes; then
PKG_CHECK_MODULES([totempg],[libtotem_pg])
Index: libdlm/group/dlm_controld/Makefile.am
===================================================================
--- libdlm.orig/group/dlm_controld/Makefile.am
+++ libdlm/group/dlm_controld/Makefile.am
@@ -68,7 +68,7 @@ dlm_controld_pcmk_LDFLAGS = $(shared_LIB
$(glib_LIBS) \
$(xml_LIBS) \
$(totempg_LIBS) \
- -lcib -lcrmcommon -lcrmcluster
+ -lcib -lcrmcommon -lcrmcluster -lconfdb
dlm_controld_pcmk_LDADD = $(shared_LDADD)
++++++ upstream-submissions.diff ++++++
Index: libdlm/group/dlm_controld/pacemaker.c
===================================================================
--- libdlm.orig/group/dlm_controld/pacemaker.c
+++ libdlm/group/dlm_controld/pacemaker.c
@@ -55,7 +55,6 @@ void close_cluster_cfg(void) {}
extern int ais_fd_async;
-int local_node_id = 0;
char *local_node_uname = NULL;
void dlm_process_node(gpointer key, gpointer value, gpointer user_data);
@@ -84,7 +83,7 @@ void update_cluster(void)
cluster_quorate = crm_have_quorum;
if(last_membership < crm_peer_seq) {
log_debug("Processing membership %llu", crm_peer_seq);
- g_hash_table_foreach(crm_peer_cache, dlm_process_node, &last_membership);
+ g_hash_table_foreach(crm_peer_id_cache, dlm_process_node, &last_membership);
last_membership = crm_peer_seq;
}
}
@@ -148,12 +147,6 @@ void dlm_process_node(gpointer key, gpoi
action = "Added";
}
- if(local_node_id == 0) {
- crm_node_t *local_node = g_hash_table_lookup(
- crm_peer_cache, local_node_uname);
- local_node_id = local_node->id;
- }
-
do {
char ipaddr[1024];
int addr_family = AF_INET;
@@ -204,16 +197,16 @@ void dlm_process_node(gpointer key, gpoi
continue;
}
- log_debug("Adding address %s to configfs for node %u/%s ", addr, node->id, node->uname);
- add_configfs_node(node->id, ((char*)&cna_addr), cna_len, (node->id == local_node_id));
+ log_debug("Adding address %s to configfs for node %u", addr, node->id);
+ add_configfs_node(node->id, ((char*)&cna_addr), cna_len, (node->id == our_nodeid));
} while(addr != NULL);
free(addr_top);
}
- log_debug("%s %sctive node %u '%s': born-on=%llu, last-seen=%llu, this-event=%llu, last-event=%llu",
+ log_debug("%s %sctive node %u: born-on=%llu, last-seen=%llu, this-event=%llu, last-event=%llu",
action, crm_is_member_active(value)?"a":"ina",
- node->id, node->uname, node->born, node->last_seen,
+ node->id, node->born, node->last_seen,
crm_peer_seq, (unsigned long long)*last);
}
@@ -251,13 +244,13 @@ void kick_node_from_cluster(int nodeid)
}
switch(rc) {
- case 0:
+ case 1:
log_debug("Requested that node %d be kicked from the cluster", nodeid);
break;
case -1:
log_error("Don't know how to kick node %d from the cluster", nodeid);
break;
- case 1:
+ case 0:
log_error("Could not kick node %d from the cluster", nodeid);
break;
default:
@@ -327,6 +320,8 @@ int fence_in_progress(int *in_progress)
int fence_node_time(int nodeid, uint64_t *last_fenced_time)
{
int rc = 0;
+ static time_t last_log = 0;
+
xmlNode *xpath_data;
char xpath_query[XPATH_MAX];
crm_node_t *node = crm_get_peer(nodeid, NULL);
@@ -351,11 +346,21 @@ int fence_node_time(int nodeid, uint64_t
if(xpath_data == NULL) {
/* the node has been shot - return 'now' */
- log_debug("Node %d/%s was last shot 'now'", nodeid, node->uname);
+ log_level(LOG_INFO, "Node %d/%s was last shot 'now'", nodeid, node->uname);
*last_fenced_time = time(NULL);
+ last_log = 0;
+
+ } else {
+ time_t now = time(NULL);
+ if(last_log == 0) {
+ log_level(LOG_INFO, "Node %d/%s has not been shot yet", nodeid, node->uname);
+
+ } else if(now - last_log > 30) {
+ log_level(LOG_DEBUG, "Node %d/%s has still not been shot yet", nodeid, node->uname);
+ }
+ last_log = now;
}
free_xml(xpath_data);
- log_debug("It does not appear node %d/%s has been shot", nodeid, node->uname);
return 0;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org