commit libdlm

Hello community, here is the log from the commit of package libdlm checked in at Thu Oct 9 12:00:46 CEST 2008. -------- --- libdlm/libdlm.changes 2008-09-15 16:26:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/libdlm/libdlm.changes 2008-10-09 10:36:19.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 9 10:23:42 CEST 2008 - abeekhof@suse.de + +- Update to upstream b6d73f5752306d635f306036438af1fcf26f4332 +- Adds protocol negotiation which important for future compatability +- Miscelaneous bug fixes + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdlm.spec ++++++ --- /var/tmp/diff_new_pack.i21216/_old 2008-10-09 11:59:04.000000000 +0200 +++ /var/tmp/diff_new_pack.i21216/_new 2008-10-09 11:59:04.000000000 +0200 @@ -32,7 +32,7 @@ Name: libdlm Summary: Application interface to the kernel's distributed lock manager Version: 2.99.08 -Release: 3 +Release: 4 License: GPL v2 only; GPL v2 or later; LGPL v2.1 or later Url: http://sources.redhat.com/cluster/wiki Group: Productivity/Clustering/HA @@ -41,6 +41,7 @@ Patch1: pacemaker.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on +Requires: pacemaker BuildRequires: glib2-devel kernel-source >= 2.6.26 libopenais-devel libpacemaker-devel libxml2-devel %description @@ -204,7 +205,7 @@ --mandir=%{_mandir} --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} \ --without_cman --without_fence --without_gfs --without_gfs2 --without_gnbd --without_rgmanager --without_bindings --without_kernel_modules --disable_kernel_check \ - --enable_pacemaker + --enable_pacemaker --without_config export MAKE="make %{?jobs:-j%jobs}" make %{?jobs:-j%jobs} ########################################################### @@ -267,6 +268,10 @@ %{_datadir}/man/man3/libdlm.3.gz %changelog +* Thu Oct 09 2008 abeekhof@suse.de +- Update to upstream b6d73f5752306d635f306036438af1fcf26f4332 +- Adds protocol negotiation which important for future compatability +- Miscelaneous bug fixes * Mon Sep 15 2008 abeekhof@suse.de - Reference newly created shared library packages as build dependancies * Mon Sep 08 2008 abeekhof@suse.de ++++++ libdlm.tar.gz ++++++ ++++ 18530 lines of diff (skipped) ++++++ pacemaker.c ++++++ --- libdlm/pacemaker.c 2008-08-25 09:47:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/libdlm/pacemaker.c 2008-10-09 10:36:22.000000000 +0200 @@ -18,44 +18,6 @@ #define COMMS_DIR "/sys/kernel/config/dlm/cluster/comms" -/* was a config value set on command line?, 0 or 1. - optk is a kernel option, optd is a daemon option */ - -int optk_debug; -int optk_timewarn; -int optk_protocol; -int optd_groupd_compat; -int optd_debug_logsys; -int optd_enable_fencing; -int optd_enable_quorum; -int optd_enable_deadlk; -int optd_enable_plock; -int optd_plock_debug; -int optd_plock_rate_limit; -int optd_plock_ownership; -int optd_drop_resources_time; -int optd_drop_resources_count; -int optd_drop_resources_age; - -/* actual config value from command line, cluster.conf, or default. - cfgk is a kernel config value, cfgd is a daemon config value */ - -int cfgk_debug = -1; -int cfgk_timewarn = -1; -int cfgk_protocol = -1; -int cfgd_groupd_compat = DEFAULT_GROUPD_COMPAT; -int cfgd_debug_logsys = DEFAULT_DEBUG_LOGSYS; -int cfgd_enable_fencing = DEFAULT_ENABLE_FENCING; -int cfgd_enable_quorum = DEFAULT_ENABLE_QUORUM; -int cfgd_enable_deadlk = DEFAULT_ENABLE_DEADLK; -int cfgd_enable_plock = DEFAULT_ENABLE_PLOCK; -int cfgd_plock_debug = DEFAULT_PLOCK_DEBUG; -int cfgd_plock_rate_limit = DEFAULT_PLOCK_RATE_LIMIT; -int cfgd_plock_ownership = DEFAULT_PLOCK_OWNERSHIP; -int cfgd_drop_resources_time = DEFAULT_DROP_RESOURCES_TIME; -int cfgd_drop_resources_count = DEFAULT_DROP_RESOURCES_COUNT; -int cfgd_drop_resources_age = DEFAULT_DROP_RESOURCES_AGE; - int setup_ccs(void) { /* To avoid creating an additional place for the dlm to be configured, @@ -82,11 +44,13 @@ closelog(); } +extern int ais_fd_async; + int local_node_id = 0; char *local_node_uname = NULL; -extern int ais_fd_async; +void dlm_process_node(gpointer key, gpointer value, gpointer user_data); -int setup_cman(void) +int setup_cluster(void) { int retries = 0; int rc = SA_AIS_OK; @@ -147,7 +111,23 @@ return ais_fd_async; } -void process_cman(int ci) +static void statechange(void) +{ + static uint64_t last_membership = 0; + 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); + last_membership = crm_peer_seq; + } +} + +void update_cluster(void) +{ + statechange(); +} + +void process_cluster(int ci) { /* ci ::= client number */ char *data = NULL; @@ -244,7 +224,7 @@ /* crm_log_xml_info(xml, __PRETTY_FUNCTION__); */ xml_child_iter(xml, node, crm_update_ais_node(node, crm_peer_seq)); crm_calculate_quorum(); - cman_statechange(); + statechange(); free_xml(xml); } else { @@ -274,7 +254,7 @@ return; } -void close_cman(void) { +void close_cluster(void) { /* TODO: Implement something for this */ return; } @@ -282,7 +262,7 @@ #include #include -static void dlm_process_node(gpointer key, gpointer value, gpointer user_data) +void dlm_process_node(gpointer key, gpointer value, gpointer user_data) { int rc = 0; struct stat tmp; @@ -397,18 +377,7 @@ crm_peer_seq, (unsigned long long)*last); } -void cman_statechange(void) -{ - static uint64_t last_membership = 0; - cman_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); - last_membership = crm_peer_seq; - } -} - -int is_cman_member(int nodeid) +int is_cluster_member(int nodeid) { crm_node_t *node = crm_get_peer(nodeid, NULL); return crm_is_member_active(node); ++++++ pacemaker.diff ++++++ --- /var/tmp/diff_new_pack.i21216/_old 2008-10-09 11:59:07.000000000 +0200 +++ /var/tmp/diff_new_pack.i21216/_new 2008-10-09 11:59:07.000000000 +0200 @@ -1,75 +1,70 @@ +Only in dev: .DS_Store Only in dev: .hgtags ---- cluster-rh/Makefile 2008-08-20 13:14:56.000000000 +0200 -+++ dev/Makefile 2008-08-25 09:33:19.000000000 +0200 -@@ -1,7 +1,7 @@ - include make/defines.mk - - REALSUBDIRS = gnbd-kernel/src gfs-kernel/src/gfs \ -- cman/lib config cman dlm fence/libfenced group \ -+ cman/lib cman dlm fence/libfenced group \ - fence gfs gfs2 gnbd rgmanager bindings doc - - SUBDIRS = $(filter-out \ ---- cluster-rh/configure 2008-08-13 22:24:12.000000000 +0200 -+++ dev/configure 2008-08-25 09:33:21.000000000 +0200 -@@ -87,6 +87,7 @@ my %options = ( - enable_crack_of_the_day => \$enable_crack_of_the_day, +--- cluster-rh/configure 2008-09-01 13:51:56.000000000 +0200 ++++ dev/configure 2008-09-01 13:57:26.000000000 +0200 +@@ -88,6 +88,7 @@ my %options = ( enable_legacy_code => \$enable_legacy_code, - enable_xen => \$enable_xen, + enable_contrib => \$enable_contrib, + enable_virt => \$enable_virt, + enable_pacemaker => \$enable_pacemaker, somajor => \$somajor, sominor => \$sominor, release_version => \$release_version, -@@ -176,6 +177,7 @@ my $err = &GetOptions (\%options, - 'enable_crack_of_the_day', +@@ -178,6 +179,7 @@ my $err = &GetOptions (\%options, 'enable_legacy_code', - 'enable_xen', + 'enable_contrib', + 'enable_virt', + 'enable_pacemaker', - 'without_ccs', + 'without_config', 'without_cman', 'without_dlm', -@@ -267,6 +269,7 @@ if ($help || !$err) { - print "--fenceagentslibdir=\tspecify directory where to install common fence python lib. (Default: /usr/share/fence)\n"; - print "--enable_crack_of_the_day\tEnable build of highly experimental features that rely on code that is not yet available for general use. (Default: no)\n"; +@@ -271,6 +273,7 @@ if ($help || !$err) { + print "--enable_contrib\tEnable build of community contributed code/tools. (Default: no)\n"; print "--enable_legacy_code\tEnable build of old/obsolete/unsupported code/tools. (Default: no)\n"; + print "--enable_virt\tEnable building of virtualization code (Default: disabled\n"; + print "--enable_pacemaker\tEnable building of Pacemaker-specific pieces\n"; - print "--enable_xen\tEnable building of Xen-specific pieces\n"; - print "--without_ccs\tDisable ccs building (Default: enabled)\n"; + print "--without_config\tDisable config building (Default: enabled)\n"; print "--without_cman\tDisable cman building (Default: enabled)\n"; -@@ -604,6 +607,9 @@ if (!$enable_legacy_code) { - print "\n********************************************************************************************\n"; - $cflags="${cflags} -DLEGACY_CODE"; + print "--without_dlm\tDisable dlm building (Default: enabled)\n"; +@@ -613,6 +616,9 @@ if (!$enable_legacy_code) { + if (!$enable_virt) { + $enable_virt=""; } +if (!$enable_pacemaker) { + $enable_pacemaker="" +} - if (!$enable_xen) { - $enable_xen=""; + if (!$without_config) { + $without_config=""; } -@@ -749,6 +755,7 @@ while (<IFILE>) { - $_ =~ s/\@ENABLE_CRACK_OF_THE_DAY\@/$enable_crack_of_the_day/; +@@ -756,6 +762,7 @@ while (<IFILE>) { $_ =~ s/\@ENABLE_LEGACY_CODE\@/$enable_legacy_code/; - $_ =~ s/\@ENABLE_XEN\@/$enable_xen/; + $_ =~ s/\@ENABLE_CONTRIB\@/$enable_contrib/; + $_ =~ s/\@ENABLE_VIRT\@/$enable_virt/; + $_ =~ s/\@ENABLE_PACEMAKER\@/$enable_pacemaker/; - $_ =~ s/\@DISABLE_CCS\@/$without_ccs/; + $_ =~ s/\@DISABLE_CONFIG\@/$without_config/; $_ =~ s/\@DISABLE_CMAN\@/$without_cman/; $_ =~ s/\@DISABLE_DLM\@/$without_dlm/; Only in dev/gfs: make Only in dev/gfs-kernel: make +Only in dev/group: .DS_Store --- cluster-rh/group/Makefile 2008-08-13 22:24:12.000000000 +0200 -+++ dev/group/Makefile 2008-08-25 09:33:29.000000000 +0200 -@@ -1,4 +1,8 @@ ++++ dev/group/Makefile 2008-09-01 14:19:18.000000000 +0200 +@@ -1,4 +1,12 @@ include ../make/defines.mk include $(OBJDIR)/make/passthrough.mk -SUBDIRS=lib libgfscontrol daemon tool dlm_controld gfs_control gfs_controld man +SUBDIRS = lib dlm_controld + ++ifndef without_gfs ++SUBDIRS += libgfscontrol gfs_control gfs_controld ++endif ++ +ifndef enable_pacemaker -+SUBDIRS += tool libgfscontrol daemon gfs_control gfs_controld man ++SUBDIRS += tool daemon man +endif ---- cluster-rh/group/daemon/gd_internal.h 2008-08-13 22:24:12.000000000 +0200 -+++ dev/group/daemon/gd_internal.h 2008-08-25 09:33:29.000000000 +0200 +--- cluster-rh/group/daemon/gd_internal.h 2008-10-01 14:27:52.000000000 +0200 ++++ dev/group/daemon/gd_internal.h 2008-10-09 09:06:43.000000000 +0200 @@ -21,8 +21,13 @@ #include #include @@ -168,35 +163,26 @@ depends: $(MAKE) -C ../lib all ---- cluster-rh/group/dlm_controld/cpg.c 2008-08-20 13:14:56.000000000 +0200 -+++ dev/group/dlm_controld/cpg.c 2008-08-25 09:33:29.000000000 +0200 -@@ -1,6 +1,8 @@ - #include "dlm_daemon.h" - #include "config.h" -+#ifndef ENABLE_PACEMAKER - #include "libfenced.h" -+#endif - - uint32_t cpgname_to_crc(const char *data, int len); - -@@ -385,6 +387,7 @@ static void node_history_fail(struct loc +--- cluster-rh/group/dlm_controld/cpg.c 2008-10-09 09:04:47.000000000 +0200 ++++ dev/group/dlm_controld/cpg.c 2008-10-09 09:06:43.000000000 +0200 +@@ -418,6 +418,7 @@ static void node_history_fail(struct loc static int check_fencing_done(struct lockspace *ls) { +#ifndef ENABLE_PACEMAKER struct node *node; - struct fenced_node nodeinfo; - struct fenced_domain domain; -@@ -432,6 +435,7 @@ static int check_fencing_done(struct loc + uint64_t last_fenced_time; + int in_progress, wait_count = 0; +@@ -462,6 +463,7 @@ static int check_fencing_done(struct loc - if (domain.victim_count) + if (in_progress) return 0; +#endif return 1; } ---- cluster-rh/group/dlm_controld/dlm_daemon.h 2008-08-20 13:14:56.000000000 +0200 -+++ dev/group/dlm_controld/dlm_daemon.h 2008-08-25 09:33:29.000000000 +0200 +--- cluster-rh/group/dlm_controld/dlm_daemon.h 2008-10-09 09:04:47.000000000 +0200 ++++ dev/group/dlm_controld/dlm_daemon.h 2008-10-09 09:06:44.000000000 +0200 @@ -32,8 +32,13 @@ #include #include @@ -212,8 +198,8 @@ #include #include "libdlmcontrol.h" Only in dev/group/dlm_controld: pacemaker.c ---- cluster-rh/make/defines.mk.input 2008-08-20 13:14:56.000000000 +0200 -+++ dev/make/defines.mk.input 2008-08-25 09:33:29.000000000 +0200 +--- cluster-rh/make/defines.mk.input 2008-09-01 13:51:56.000000000 +0200 ++++ dev/make/defines.mk.input 2008-09-01 13:59:25.000000000 +0200 @@ -22,6 +22,7 @@ RANLIB = ranlib CFLAGS += @CFLAGS@ -I@SRCDIR@/make @@ -222,11 +208,11 @@ CFLAGS += -DLOGDIR=\"@LOGDIR@\" -DSYSLOGFACILITY=@SYSLOGFACILITY@ -DSYSLOGLEVEL=@SYSLOGLEVEL@ LDFLAGS += @LDFLAGS@ -@@ -70,6 +71,7 @@ fenceagentslibdir ?= @FENCEAGENTSLIBDIR@ - experimental_build ?= @ENABLE_CRACK_OF_THE_DAY@ +@@ -71,6 +72,7 @@ experimental_build ?= @ENABLE_CRACK_OF_T legacy_code ?= @ENABLE_LEGACY_CODE@ - enable_xen ?= @ENABLE_XEN@ + contrib_code ?= @ENABLE_CONTRIB@ + enable_virt ?= @ENABLE_VIRT@ +enable_pacemaker ?= @ENABLE_PACEMAKER@ without_gnbd-kernel/src ?= @DISABLE_GNBDKERNEL@ without_gfs-kernel/src/gfs ?= @DISABLE_GFSKERNEL@ - without_cman/lib ?= @DISABLE_CMAN@ + without_config ?= @DISABLE_CONFIG@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org