Hello community,
here is the log from the commit of package lvm2
checked in at Thu May 1 15:03:51 CEST 2008.
--------
--- lvm2/lvm2.changes 2008-04-23 07:25:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/lvm2/lvm2.changes 2008-04-30 12:00:20.832932000 +0200
@@ -1,0 +2,16 @@
+Wed Apr 30 12:17:29 CEST 2008 - hare@suse.de
+
+- Fixup build errors
+
+-------------------------------------------------------------------
+Wed Apr 30 09:22:55 CEST 2008 - xwhu@suse.de
+
+- Cleanup clvmd code on openais stack to make it work
+- Split clvmd into a separate package (bnc#384708)
+
+-------------------------------------------------------------------
+Wed Apr 23 12:16:22 CEST 2008 - xwhu@suse.de
+
+- Change async lock primitives to sync
+
+-------------------------------------------------------------------
New:
----
clvmd-fix-node-hash.diff
clvmd-node-number-fix.diff
clvmd-openais-sync.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lvm2.spec ++++++
--- /var/tmp/diff_new_pack.j28168/_old 2008-05-01 15:02:57.000000000 +0200
+++ /var/tmp/diff_new_pack.j28168/_new 2008-05-01 15:02:57.000000000 +0200
@@ -11,18 +11,16 @@
Name: lvm2
-BuildRequires: device-mapper-devel module-init-tools openais-devel
+BuildRequires: device-mapper-devel openais-devel
License: GPL v2 or later; LGPL v2.1 or later
Group: System/Base
Requires: device-mapper >= 1.02.23
Provides: lvm
Obsoletes: lvm
-%if %suse_version > 800
PreReq: %fillup_prereq %insserv_prereq
-%endif
AutoReqProv: on
Version: 2.02.33
-Release: 17
+Release: 19
Summary: LVM2 Tools
Source: LVM2.%{version}.tar.bz2
Source1: lvm.conf
@@ -38,6 +36,9 @@
Patch11: cmdline_large_minor.diff
Patch12: enable-clvmd.patch
Patch13: pipe_buff-definition.diff
+Patch14: clvmd-openais-sync.diff
+Patch15: clvmd-fix-node-hash.diff
+Patch16: clvmd-node-number-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -46,6 +47,17 @@
+%package clvm
+License: GPL v2 or later; LGPL v2.1 or later
+Requires: %{name}-%{version} openais
+Summary: Clustered LVM2
+Group: System/Base
+
+%description clvm
+A daemon for using LVM2 Logival Volumes in a clustered environment.
+
+
+
%prep
%setup -n LVM2.%{version}
%patch
@@ -55,8 +67,12 @@
%patch5
%patch6
%patch10
+%patch11
%patch12
%patch13
+%patch14
+%patch15
+%patch16
%build
CFLAGS="$RPM_OPT_FLAGS" MODPROBE_CMD=/sbin/modprobe \
@@ -65,7 +81,7 @@
--mandir=%{_mandir} \
--includedir=/usr/include \
--libdir=/%_lib --enable-dmeventd --enable-cmdlib \
- --with-clvmd=openais --with-cluster=shared
+ --with-clvmd=openais
make
%install
@@ -77,11 +93,14 @@
install -d -m 755 $RPM_BUILD_ROOT/var/lock/lvm
install -D -m 755 $RPM_BUILD_ROOT/sbin/clvmd $RPM_BUILD_ROOT/usr/sbin/clvmd
rm $RPM_BUILD_ROOT/sbin/clvmd
+rm $RPM_BUILD_ROOT/%_lib/libdevmapper-event-lvm2mirror.so
+rm $RPM_BUILD_ROOT/%_lib/libdevmapper-event-lvm2snapshot.so
+rm $RPM_BUILD_ROOT/%_lib/liblvm2cmd.so
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/lvm
mkdir -p $RPM_BUILD_ROOT/etc/init.d
-install -m 744 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/var/adm/fillup-templates
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/var/adm/fillup-templates
rm $RPM_BUILD_ROOT/usr/include/lvm2cmd.h
%clean
@@ -89,13 +108,22 @@
%post
%{fillup_and_insserv -n lvm -py boot.lvm}
+/sbin/ldconfig
+
+%preun
+%{stop_on_removal boot.lvm}
%postun
%{insserv_cleanup}
+/sbin/ldconfig
+
+%files clvm
+%defattr(-,root,root)
+/usr/sbin/clvmd
%files
%defattr(-,root,root)
-%doc INSTALL COPYING COPYING.LIB README WHATS_NEW doc/*
+%doc INSTALL README WHATS_NEW doc/*
%dir /etc/lvm
%dir /etc/lvm/backup
%dir /etc/lvm/archive
@@ -104,7 +132,6 @@
%config /etc/lvm/lvm.conf
%config /etc/init.d/boot.lvm
/var/adm/fillup-templates/sysconfig.lvm
-/usr/sbin/clvmd
/sbin/fsadm
/sbin/lvchange
/sbin/lvconvert
@@ -150,14 +177,9 @@
/sbin/vgs
/sbin/vgscan
/sbin/vgsplit
-/%_lib/libdevmapper-event-lvm2mirror.so
/%_lib/libdevmapper-event-lvm2mirror.so.2.02
-/%_lib/libdevmapper-event-lvm2snapshot.so
/%_lib/libdevmapper-event-lvm2snapshot.so.2.02
-/%_lib/liblvm2cmd.so
/%_lib/liblvm2cmd.so.2.02
-/%_lib/liblvm2clusterlock.so
-/%_lib/liblvm2clusterlock.so.2.02
%{_mandir}/man8/clvmd.8.gz
%{_mandir}/man5/lvm.conf.5.gz
%{_mandir}/man8/lvchange.8.gz
@@ -204,6 +226,13 @@
%{_mandir}/man8/vgsplit.8.gz
%changelog
+* Wed Apr 30 2008 hare@suse.de
+- Fixup build errors
+* Wed Apr 30 2008 xwhu@suse.de
+- Cleanup clvmd code on openais stack to make it work
+- Split clvmd into a separate package (bnc#384708)
+* Wed Apr 23 2008 xwhu@suse.de
+- Change async lock primitives to sync
* Wed Apr 23 2008 xwhu@suse.de
- Fix build aginst beta
definition of PIPE_BUF is missing
++++++ boot.lvm ++++++
--- lvm2/boot.lvm 2007-02-20 17:00:01.000000000 +0100
+++ /mounts/work_src_done/STABLE/lvm2/boot.lvm 2008-04-30 11:48:17.255711000 +0200
@@ -7,7 +7,7 @@
### BEGIN INIT INFO
# Provides: boot.lvm
# Required-Start: boot.device-mapper boot.udev boot.rootfsck
-# X-UnitedLinux-Should-Start: boot.multipath boot.md boot.scsidev boot.dmraid
+# Should-Start: boot.multipath boot.md boot.dmraid
# Required-Stop:
# Default-Start: B
# Default-Stop:
@@ -42,22 +42,12 @@
echo "Activating LVM volume groups..."
/sbin/vgchange -a y $LVM_VGS_ACTIVATED_ON_BOOT
- # currently unavailable with lvm2
- #if test -s /etc/pvpath.cfg -a -x /sbin/pvpathrestore; then
- # /sbin/pvpathrestore
- #fi
rc_status -v -r
fi
;;
stop)
- if test -d /etc/lvmtab.d -a -x /sbin/vgchange ; then
+ if test -d /etc/lvm -a -x /sbin/vgchange ; then
/sbin/vgchange -a n
-
- # currently unavailable with lvm2
- #if test -s /etc/pvpath.cfg -a -x /sbin/pvpathsave; then
- # /sbin/pvpathsave
- #fi
-
fi
rc_status -v
;;
@@ -65,8 +55,11 @@
rc_failed 4
rc_status -v
;;
+ reload)
+ $0 start
+ ;;
*)
- echo "Usage: $0 {start|stop|status}"
+ echo "Usage: $0 {start|stop|status|reload}"
exit 1
;;
esac
++++++ clvmd-fix-node-hash.diff ++++++
--- daemons/clvmd/clvmd-openais.c
+++ daemons/clvmd/clvmd-openais.c
@@ -100,13 +100,6 @@
SaNameT lock_name;
};
-struct lock_wait
-{
- pthread_cond_t cond;
- pthread_mutex_t mutex;
- int status;
-};
-
/* Set errno to something approximating the right value and return 0 or -1 */
static int ais_to_errno(SaAisErrorT err)
{
@@ -245,12 +238,15 @@
memcpy(&target_nodeid, msg, OPENAIS_CSID_LEN);
- DEBUGLOG("Got message from nodeid %d for %d. len %d\n",
- nodeid, target_nodeid, msg_len-4);
+ DEBUGLOG("%u got message from nodeid %d for %d. len %d\n",
+ our_nodeid, nodeid, target_nodeid, msg_len-4);
- if (target_nodeid == our_nodeid)
- process_message(cluster_client, (char *)msg+OPENAIS_CSID_LEN,
- msg_len-OPENAIS_CSID_LEN, (char*)&nodeid);
+ if (nodeid != our_nodeid) //Not send by myself
+ if (target_nodeid == our_nodeid || target_nodeid == 0)
+ process_message(cluster_client,
+ (char *)msg+OPENAIS_CSID_LEN,
+ msg_len-OPENAIS_CSID_LEN,
+ (char*)&nodeid);
}
static void cpg_confchg_callback(cpg_handle_t handle,
@@ -292,7 +288,44 @@
ninfo->state = NODE_DOWN;
}
+ for (i=0; i