r930 - in lvm2/branches/wheezy/debian: . patches

Bastian Blank waldi at alioth.debian.org
Sun Mar 3 11:46:47 UTC 2013 

Author: waldi
Date: Sun Mar  3 11:46:47 2013
New Revision: 930

Log:
Revert r924.

debian/changelog: Update.

Added:
   lvm2/branches/wheezy/debian/clvm.NEWS
      - copied unchanged from r923, lvm2/trunk/debian/clvm.NEWS
   lvm2/branches/wheezy/debian/clvm.README.Debian
      - copied unchanged from r923, lvm2/trunk/debian/clvm.README.Debian
   lvm2/branches/wheezy/debian/clvm.defaults
      - copied unchanged from r923, lvm2/trunk/debian/clvm.defaults
   lvm2/branches/wheezy/debian/clvm.examples
      - copied unchanged from r923, lvm2/trunk/debian/clvm.examples
   lvm2/branches/wheezy/debian/clvm.init
      - copied unchanged from r923, lvm2/trunk/debian/clvm.init
   lvm2/branches/wheezy/debian/clvm.install
      - copied unchanged from r923, lvm2/trunk/debian/clvm.install
Modified:
   lvm2/branches/wheezy/debian/changelog
   lvm2/branches/wheezy/debian/changelog.Debian.devmapper   (props changed)
   lvm2/branches/wheezy/debian/control
   lvm2/branches/wheezy/debian/dmsetup-udeb.install   (props changed)
   lvm2/branches/wheezy/debian/dmsetup.install   (props changed)
   lvm2/branches/wheezy/debian/libdevmapper-dev.install   (props changed)
   lvm2/branches/wheezy/debian/libdevmapper1.02.1-udeb.install   (props changed)
   lvm2/branches/wheezy/debian/libdevmapper1.02.1.install   (props changed)
   lvm2/branches/wheezy/debian/libdevmapper1.02.1.symbols   (props changed)
   lvm2/branches/wheezy/debian/patches/libdm-atomic.patch   (props changed)
   lvm2/branches/wheezy/debian/rules

Modified: lvm2/branches/wheezy/debian/changelog
==============================================================================
--- lvm2/branches/wheezy/debian/changelog	Sun Mar  3 11:44:00 2013	(r929)
+++ lvm2/branches/wheezy/debian/changelog	Sun Mar  3 11:46:47 2013	(r930)
@@ -1,3 +1,9 @@
+lvm2 (2.02.95-7) UNRELEASED; urgency=low
+
+  * Re-enable cluster support. (closes: #697676)
+
+ -- Bastian Blank <waldi at debian.org>  Sun, 03 Mar 2013 12:45:51 +0100
+
 lvm2 (2.02.95-6) unstable; urgency=low
 
   * Drop cluster (clvm) support. It never properly worked and is more dead

Copied: lvm2/branches/wheezy/debian/clvm.NEWS (from r923, lvm2/trunk/debian/clvm.NEWS)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ lvm2/branches/wheezy/debian/clvm.NEWS	Sun Mar  3 11:46:47 2013	(r930, copy of r923, lvm2/trunk/debian/clvm.NEWS)
@@ -0,0 +1,11 @@
+lvm2 (2.02.39-4) unstable; urgency=low
+
+  The cluster locking support is now built as internal support. This
+  means that the lvm config needs to contain the following to use this
+  support.
+
+  global {
+      locking_type = 3
+  }
+
+ -- Bastian Blank <waldi at debian.org>  Fri, 21 Nov 2008 15:58:27 +0100

Copied: lvm2/branches/wheezy/debian/clvm.README.Debian (from r923, lvm2/trunk/debian/clvm.README.Debian)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ lvm2/branches/wheezy/debian/clvm.README.Debian	Sun Mar  3 11:46:47 2013	(r930, copy of r923, lvm2/trunk/debian/clvm.README.Debian)
@@ -0,0 +1,23 @@
+This is the cluster LVM daemon for LVM2.
+
+In conjunction with the Red Hat cluster infrastructure (cman & dlm) it
+will allow LVM volumes on shared storage to be managed from a central
+point. If you also want to share data you should also look at GFS.
+
+Only "normal" block devices may be shared. At present, snapshots and
+mirroring are not cluster aware. So, if you want to snapshot a volume
+is is VERY IMPORTANT that not only the snapshot device but also the origin
+device be activated on one node only.
+
+clvmd should be run on all nodes in the cluster, unless this is the case
+commands will fail as the integrity of the LVM metadata cannot be assured.
+
+In order to make normal lvm2 cluster-aware it is necessary to edit the
+configuration file /etc/lvm/lvm.conf as follows:
+
+in the global{} section:
+  locking_type = 3
+
+
+Patrick Caulfield <patrick at debian.org>
+24th December 2004

Copied: lvm2/branches/wheezy/debian/clvm.defaults (from r923, lvm2/trunk/debian/clvm.defaults)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ lvm2/branches/wheezy/debian/clvm.defaults	Sun Mar  3 11:46:47 2013	(r930, copy of r923, lvm2/trunk/debian/clvm.defaults)
@@ -0,0 +1,9 @@
+# Bourne shell compatible script, sourced by /etc/init.d/clvm to set
+# additional arguments for clvmd.
+
+# Startup timeout: 
+CLVMDTIMEOUT=20
+
+# Volume groups to activate on startup:
+# LVM_VGS="cluster_vg1 cluster_vg2"
+

Copied: lvm2/branches/wheezy/debian/clvm.examples (from r923, lvm2/trunk/debian/clvm.examples)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ lvm2/branches/wheezy/debian/clvm.examples	Sun Mar  3 11:46:47 2013	(r930, copy of r923, lvm2/trunk/debian/clvm.examples)
@@ -0,0 +1 @@
+scripts/clvmd_fix_conf.sh

Copied: lvm2/branches/wheezy/debian/clvm.init (from r923, lvm2/trunk/debian/clvm.init)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ lvm2/branches/wheezy/debian/clvm.init	Sun Mar  3 11:46:47 2013	(r930, copy of r923, lvm2/trunk/debian/clvm.init)
@@ -0,0 +1,143 @@
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides:          clvm
+# Required-Start:    lvm2
+# Required-Stop:     lvm2
+# Should-Start:      cman corosync openais
+# Should-Stop:       cman corosync openais
+# Default-Start:     S
+# Default-Stop:      0 6
+# Short-Description: start and stop the lvm cluster locking daemon
+### END INIT INFO
+#
+# Author: Frederik Schüler <fs at debian.org>
+# based on the old clvm init script from etch
+# and the clvmd init script from RHEL5
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Cluster LVM Daemon"
+NAME=clvm
+DAEMON=/usr/sbin/clvmd
+SCRIPTNAME=/etc/init.d/clvm
+
+[ -x $DAEMON ] || exit 0
+
+. /lib/init/vars.sh
+
+. /lib/lsb/init-functions
+
+if [ ! -f /etc/cluster/cluster.conf ]; then
+	log_failure_msg "clvmd: cluster not configured. Aborting."
+	exit 0
+fi
+
+if ! cman_tool status >/dev/null 2>&1; then
+	log_failure_msg "clvmd: cluster is not running. Aborting."
+	exit 0
+fi
+
+CLVMDTIMEOUT=20
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+DAEMON_OPTS="-T$CLVMDTIMEOUT"
+
+do_start()
+{
+	start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMON_OPTS || status="$?"
+	# flush cache
+	vgscan > /dev/null 2>&1 
+	return $status
+}
+
+do_activate()
+{
+	if [ -n "$LVM_VGS" ] ; then
+		log_action_msg  "Activating VGs $LVM_VGS"
+		vgchange -ayl $LVM_VGS || return $?
+	else
+		log_action_msg  "Activating all VGs"
+		vgchange -ayl || return $?
+	fi
+}
+
+do_deactivate()
+{
+	if [ -n "$LVM_VGS" ] ; then
+		vgs="$LVM_VGS"
+	else
+		# Hack to only deactivate clustered volumes
+		vgs=$(vgdisplay -C -o vg_name,vg_attr --noheadings 2> /dev/null | awk '($2 ~ /.....c/) {print $1}')
+	fi
+
+	[ "$vgs" ] || return 0
+
+	vgchange -anl $vgs || return $?
+}
+
+do_stop()
+{
+	start-stop-daemon --stop --quiet --name clvmd
+	status=$?
+	return $status
+}
+
+case "$1" in
+  	start)
+		# start the daemon...
+		log_daemon_msg "Starting $DESC" "$NAME"
+		do_start
+		status=$?
+		case "$status" in
+			0) log_end_msg 0 ;;
+			1) log_action_msg " already running" ; log_end_msg 0 ;;
+			*) log_end_msg 1 ;;
+		esac
+		# and activate clustered volume groups
+		do_activate
+		status=$?
+		exit $status
+	;;
+	stop)
+		# deactivate volumes...
+		log_daemon_msg "Deactivating VG $vg:"
+		do_deactivate
+		status=$?
+		case "$status" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 0 ;;
+			*) log_end_msg 1 ;;
+		esac
+		# and stop the daemon
+		log_daemon_msg "Stopping $DESC" "$NAME"
+		do_stop
+		status=$?
+		case "$status" in
+			0) log_end_msg 0 ; exit 0 ;;
+			1) log_end_msg 0 ; exit 0 ;;
+			*) log_end_msg 1 ; exit $status ;;
+		esac
+	;;
+	restart|force-reload)
+		$0 stop
+		sleep 1
+		$0 start
+	;;
+	status)
+		pid=$( pidof $DAEMON )
+		if [ -n "$pid" ] ; then
+			log_action_msg "$DESC is running" 
+		else
+			log_action_msg "$DESC is not running"
+		fi
+		exit 0
+	;;
+	*)
+		echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
+		exit 1
+	;;
+esac
+
+exit 0

Copied: lvm2/branches/wheezy/debian/clvm.install (from r923, lvm2/trunk/debian/clvm.install)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ lvm2/branches/wheezy/debian/clvm.install	Sun Mar  3 11:46:47 2013	(r930, copy of r923, lvm2/trunk/debian/clvm.install)
@@ -0,0 +1,2 @@
+usr/sbin/clvmd
+usr/share/man/man8/clvmd*

Modified: lvm2/branches/wheezy/debian/control
==============================================================================
--- lvm2/branches/wheezy/debian/control	Sun Mar  3 11:44:00 2013	(r929)
+++ lvm2/branches/wheezy/debian/control	Sun Mar  3 11:46:47 2013	(r930)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian LVM Team <pkg-lvm-maintainers at lists.alioth.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>
-Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libcman-dev (>> 2), libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, openais-dev, pkg-config
 Standards-Version: 3.9.1
 Homepage: http://sources.redhat.com/lvm2/
 Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/
@@ -35,6 +35,18 @@
  volume groups can be allocated to logical volumes, which are accessed as
  regular block devices.
 
+Package: clvm
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base
+Recommends: corosync | openais | cman
+Multi-Arch: foreign
+Description: Cluster LVM Daemon for lvm2
+ This package provides the clustering interface for lvm2, when used with
+ Red Hat's "cman" or corosync based (eg Pacemaker) cluster infrastructure.
+ It allows logical volumes to be created on shared storage devices
+ (eg Fibre Channel, or iSCSI).
+
 Package: libdevmapper-dev
 Section: libdevel
 Architecture: any

Modified: lvm2/branches/wheezy/debian/rules
==============================================================================
--- lvm2/branches/wheezy/debian/rules	Sun Mar  3 11:44:00 2013	(r929)
+++ lvm2/branches/wheezy/debian/rules	Sun Mar  3 11:46:47 2013	(r930)
@@ -77,7 +77,8 @@
 	$(CONFIGURE) \
 		--libdir=\$${exec_prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--with-optimisation="$(CFLAGS_OPT_DEB)" \
-		--with-cluster=none \
+		--with-clvmd=cman,corosync,openais \
+		--with-cluster=internal \
 		--with-thin=internal \
 		--with-device-uid=0 \
 		--with-device-gid=6 \
@@ -160,6 +161,13 @@
 	dh_md5sums
 	dh_builddeb $(BUILDDEB_ARGS)
 
+install_clvm: export DH_OPTIONS = -pclvm
+install_clvm: DIR = $(BUILD_DIR)/install_deb
+install_clvm: $(STAMPS_DIR)/install_deb
+	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
+	dh_installinit --no-start -- start 63 S . start 51 0 6 .
+	+$(MAKE_SELF) install-base
+
 install_dmeventd: export DH_OPTIONS = -pdmeventd
 install_dmeventd: DIR = $(BUILD_DIR)/install_deb
 install_dmeventd: $(STAMPS_DIR)/install_deb install_liblvm2
@@ -238,7 +246,7 @@
 	+$(MAKE_SELF) install-base
 
 binary-indep:
-binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-event libdevmapper-dev dmsetup dmsetup-udeb dmeventd liblvm2 lvm2 lvm2-udeb)
+binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-event libdevmapper-dev dmsetup dmsetup-udeb dmeventd liblvm2 lvm2 lvm2-udeb clvm)
 
 binary: binary-indep binary-arch

More information about the pkg-lvm-commits mailing list