[DRBD-cvs] r1917 - in branches/drbd-0.7: . debian documentation
scripts
drbd-cvs at lists.linbit.com
drbd-cvs at lists.linbit.com
Wed Aug 24 15:21:21 CEST 2005
Author: phil
Date: 2005-08-24 15:21:20 +0200 (Wed, 24 Aug 2005)
New Revision: 1917
Modified:
branches/drbd-0.7/ChangeLog
branches/drbd-0.7/debian/changelog
branches/drbd-0.7/debian/control
branches/drbd-0.7/debian/drbd0.7-utils.prerm
branches/drbd-0.7/debian/rules
branches/drbd-0.7/documentation/drbd.conf.sgml
branches/drbd-0.7/drbd.spec.in
branches/drbd-0.7/scripts/drbd.conf
Log:
* Integrated debian's changes to drbd-0.7.11
* Fixed the spec file
* Documented "isable-ip-verification" nd "size" in the "disk" section.
Modified: branches/drbd-0.7/ChangeLog
===================================================================
--- branches/drbd-0.7/ChangeLog 2005-08-24 10:04:18 UTC (rev 1916)
+++ branches/drbd-0.7/ChangeLog 2005-08-24 13:21:20 UTC (rev 1917)
@@ -20,7 +20,7 @@
* The "size" option is now allowed in the disk section
* A new "disable-ip-verification" option for the global section
* The "disable-io-hints" option is not longer available.
- * Fixed a potential very unlikely race condigtion that in the end would
+ * Fixed a potential very unlikely race condition that in the end would
trigger an ERR in drbd_actlog.c:607. Actually I never saw this trigger.
* Fixed a logic bug in _drbd_process_ee() that, paired with a race condition
could trigger a "ASSERT(b->n_req == set_size)" upon disconnect.
Modified: branches/drbd-0.7/debian/changelog
===================================================================
--- branches/drbd-0.7/debian/changelog 2005-08-24 10:04:18 UTC (rev 1916)
+++ branches/drbd-0.7/debian/changelog 2005-08-24 13:21:20 UTC (rev 1917)
@@ -1,23 +1,63 @@
-drbd (0.7.11-0) unstable; urgency=low
+drbd (0.7.12-0) unstable; urgency=low
- * (Philipp Reisner)
- - New upstream release
+ * New upstream release
- -- Philipp Reisner <phil at linbit.com> Mon, 23 May 2005 15:29:21 +0200
+ -- <Philipp Reisner <phil at linbit.com> Wed, 24 Aug 2005 15:01:10 +0100
-drbd (0.7.10-0) unstable; urgency=low
+drbd (0.7.11-1) unstable; urgency=low
- * (Philipp Reisner)
+ * New upstream release
+
+ -- Cyril Bouthors <cyril at bouthors.org> Mon, 20 Jun 2005 15:49:40 +0300
+
+drbd (0.7.10-4) unstable; urgency=low
+
+ * debian/control: added missing dependency to dpatch for
+ drbd0.7-module-source (closes: #308295).
+ * debian/control: updated Maintainer and Uploaders fields to match
+ reality.
+
+ -- Cyril Bouthors <cyril at bouthors.org> Mon, 30 May 2005 11:22:46 +0300
+
+drbd (0.7.10-3) unstable; urgency=low
+
+ * (Cyril Bouthors)
+ - scripts/drbd: explicit modprobe and rmmod pathnames
+ (initscript_explicit_pathname.patch) (closes: #303060, #302556).
+
+ -- Cyril Bouthors <cyril at bouthors.org> Sun, 17 Apr 2005 18:08:30 +0300
+
+drbd (0.7.10-2) unstable; urgency=low
+
+ * (Cyril Bouthors)
+ - debian/drbd0.7-utils.prerm: silently ignore the initscript return
+ code if we remove or deconfigure the package or carefully pay
+ attention to it if we upgrade the package. (closes: #295533).
+ - debian/control: fixed drbd0.7-module-source description.
+
+ -- Cyril Bouthors <cyril at bouthors.org> Wed, 16 Feb 2005 21:05:51 +0100
+
+drbd (0.7.10-1) unstable; urgency=low
+
+ * (Cyril Bouthors)
- New upstream release
- -- Philipp Reisner <phil at linbit.com> Mon, 31 Jan 2005 10:17:00 +0100
+ -- Cyril Bouthors <cyril at bouthors.org> Mon, 31 Jan 2005 17:29:27 +0300
-drbd (0.7.9-0) unstable; urgency=low
+drbd (0.7.9-2) unstable; urgency=low
- * (Philipp Reisner)
+ * (Cyril Bouthors)
+ - Applied patch from Lars Marowsky-Bree <lmb at suse.de> that fixes a
+ "severe [...] memory corruption bug [...]".
+
+ -- Cyril Bouthors <cyril at bouthors.org> Thu, 27 Jan 2005 13:55:00 +0300
+
+drbd (0.7.9-1) unstable; urgency=low
+
+ * (Cyril Bouthors)
- New upstream release
- -- Philipp Reisner <phil at linbit.com> Tue, 25 Jan 2005 11:31:00 +0100
+ -- Cyril Bouthors <cyril at bouthors.org> Thu, 27 Jan 2005 11:35:19 +0300
drbd (0.7.8-1) unstable; urgency=low
Modified: branches/drbd-0.7/debian/control
===================================================================
--- branches/drbd-0.7/debian/control 2005-08-24 10:04:18 UTC (rev 1916)
+++ branches/drbd-0.7/debian/control 2005-08-24 13:21:20 UTC (rev 1917)
@@ -1,9 +1,9 @@
Source: drbd
Section: admin
Priority: extra
-Maintainer: David Krovich <dkrovich at csee.wvu.edu>
-Uploaders: Philipp Hug <debian at hug.cx>, Cyril Bouthors <cyril at bouthors.org>
-Build-Depends: debhelper (>= 4), debconf-utils, sp, docbook-utils, bison, flex
+Maintainer: Cyril Bouthors <cyril at bouthors.org>
+Uploaders: David Krovich <dkrovich at csee.wvu.edu>, Philipp Hug <debian at hug.cx>
+Build-Depends: debhelper (>= 4), debconf-utils, sp, docbook-utils, bison, flex, dpatch
Standards-Version: 3.6.1
Package: drbd0.7-utils
@@ -16,34 +16,32 @@
Suggests: heartbeat
Description: RAID 1 over tcp/ip for Linux utilities
Drbd is a block device which is designed to build high availability
- clusters by providing a virtual shared device which keeps disks in nodes
- synchronised using TCP/IP. This simulates RAID 1 but avoiding the
- use of uncommon hardware (shared SCSI buses or Fibre Channel).
+ clusters by providing a virtual shared device which keeps disks in
+ nodes synchronised using TCP/IP. This simulates RAID 1 but avoiding
+ the use of uncommon hardware (shared SCSI buses or Fibre Channel).
It is currently limited to fail-over HA clusters.
.
- This package contains the programs that will control the
- drbd kernel module provided in drbd-source. You will need a clustering
- service (such as heartbeat) to fully implement it.
+ This package contains the programs that will control the drbd kernel
+ module provided in drbd-source. You will need a clustering service
+ (such as heartbeat) to fully implement it.
.
Homepage: http://www.drbd.org
Package: drbd0.7-module-source
Architecture: all
Section: admin
-Depends: module-assistant, debhelper (>= 4),
+Depends: module-assistant, debhelper (>= 4), dpatch
Conflicts: drbd-module-source, drbd-source
Provides: drbd-module-source
Replaces: drbd-module-source, drbd-source
Recommends: dpkg-dev, kernel-package, debconf-utils
Description: RAID 1 over tcp/ip for Linux module source
Drbd is a block device which is designed to build high availability
- clusters by providing a virtual shared device which keeps disks in nodes
- synchronised using TCP/IP. This simulates RAID 1 but avoiding the
- use of uncommon hardware (shared SCSI buses or Fibre Channel).
+ clusters by providing a virtual shared device which keeps disks in
+ nodes synchronised using TCP/IP. This simulates RAID 1 but avoiding
+ the use of uncommon hardware (shared SCSI buses or Fibre Channel).
It is currently limited to fail-over HA clusters.
.
- This package contains the programs that will control the
- drbd kernel module provided in drbd-source. You will need a clustering
- service (such as heartbeat) to fully implement it.
+ This package contains the source code for the drbd kernel module.
.
Homepage: http://www.drbd.org
Modified: branches/drbd-0.7/debian/drbd0.7-utils.prerm
===================================================================
--- branches/drbd-0.7/debian/drbd0.7-utils.prerm 2005-08-24 10:04:18 UTC (rev 1916)
+++ branches/drbd-0.7/debian/drbd0.7-utils.prerm 2005-08-24 13:21:20 UTC (rev 1917)
@@ -1,6 +1,30 @@
#!/bin/sh
-if [ -x "/etc/init.d/drbd" ]; then
- /etc/init.d/drbd stop
+# This script silently ignores the initscript return code if we remove
+# or deconfigure the package or carefully pay attention to it if we
+# upgrade the package.
+
+# Cyril Bouthors <cyril at bouthors.org>
+# Wed Feb 16 21:01:11 CET 2005
+
+set -e
+
+if [ -x "/etc/init.d/drbd" ]
+then
+ case "$1" in
+ remove|deconfigure)
+ /etc/init.d/drbd stop || true
+ ;;
+
+ upgrade|failed-upgrade)
+ /etc/init.d/drbd stop
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+ esac
fi
+
#DEBHELPER#
Modified: branches/drbd-0.7/debian/rules
===================================================================
--- branches/drbd-0.7/debian/rules 2005-08-24 10:04:18 UTC (rev 1916)
+++ branches/drbd-0.7/debian/rules 2005-08-24 13:21:20 UTC (rev 1917)
@@ -7,8 +7,10 @@
# build-arch and build-indep targets by Bill Allombert 2001
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+
# This has to be exported to make some magic below work.
export DH_OPTIONS
@@ -34,7 +36,7 @@
KO=k
endif
-kdist_clean:
+kdist_clean: unpatch
dh_clean
-$(MAKE) -C drbd clean
@@ -60,11 +62,11 @@
dh_md5sums
dh_builddeb --destdir=$(DEB_DESTDIR)
-#Architecture
-build: build-arch build-indep
+#Architecture
+build: patch build-arch build-indep
build-arch: build-arch-stamp
-build-arch-stamp:
+build-arch-stamp:
dh_testdir
$(MAKE) -C user
$(MAKE) -C scripts
@@ -73,10 +75,10 @@
touch build-arch-stamp
build-indep: build-indep-stamp
-build-indep-stamp:
+build-indep-stamp:
touch build-indep-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
@@ -89,13 +91,13 @@
-$(MAKE) -C benchmark clean
-$(MAKE) -C documentation clean
-$(MAKE) -C drbd clean
- dh_clean
+ dh_clean
install: install-arch install-indep
install-indep:
dh_testdir
dh_testroot
- dh_clean -k -i
+ dh_clean -k -i
dh_installdirs -i
cp -a drbd/* debian/$(PACKAGE)-source/usr/src/modules/drbd/drbd
cp Makefile debian/$(PACKAGE)-source/usr/src/modules/drbd
@@ -115,7 +117,7 @@
install-arch:
dh_testdir
dh_testroot
- dh_clean -k -s
+ dh_clean -k -s
dh_installdirs -s
$(MAKE) PREFIX=$(CURDIR)/debian/drbd0.7-utils/ -C user install
$(MAKE) PREFIX=$(CURDIR)/debian/drbd0.7-utils/ -C scripts install
@@ -133,8 +135,8 @@
dh_installdocs
dh_installexamples
# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
+# dh_installdebconf
+# dh_installlogrotate
# dh_installemacsen
# dh_installpam
# dh_installmime
@@ -144,7 +146,7 @@
dh_installman
dh_link
dh_strip
- dh_compress
+ dh_compress
dh_fixperms
# dh_perl
# dh_python
@@ -163,4 +165,4 @@
$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch patch unpatch
Modified: branches/drbd-0.7/documentation/drbd.conf.sgml
===================================================================
--- branches/drbd-0.7/documentation/drbd.conf.sgml 2005-08-24 10:04:18 UTC (rev 1916)
+++ branches/drbd-0.7/documentation/drbd.conf.sgml 2005-08-24 13:21:20 UTC (rev 1917)
@@ -111,7 +111,7 @@
<listitem><para>
Configures some global parameters. Currently only
<option>minor-count</option>, <option>dialog-refresh</option>
- and <option>disable-io-hints</option>
+ and <option>disable-ip-verification</option>
are allowed here. You may only have one global section, preferably
as the first section.
</para>
@@ -155,7 +155,8 @@
refer to <citerefentry><refentrytitle>drbdsetup</refentrytitle>
<manvolnum>8</manvolnum></citerefentry> for detailed description of
the parameters.
- Optional parameter: <option>on-io-error</option>.
+ Optional parameter: <option>on-io-error</option>,
+ <option>size</option>.
</para>
</listitem>
</varlistentry>
@@ -238,13 +239,13 @@
</varlistentry>
<varlistentry>
- <term><option>disable-io-hints</option></term>
+ <term><option>disable-ip-verification</option></term>
<listitem>
- <para>Use <replaceable>disable-io-hints</replaceable>
- if you want to set up a DRBD device via the
- loopback network interface or between two virtual machines on the same
- box, for testing/simulating/presentationn
- otherwise it could trigger a run_tasq_queue deadlock.</para>
+ <para>Use <replaceable>disable-ip-verification</replaceable>
+ if, for some obscure reasons, drbdadm can/might not use ip or ifconfig
+ to do a santiy check for the IP address, you can disable it with this
+ this option.
+ </para>
</listitem>
</varlistentry>
Modified: branches/drbd-0.7/drbd.spec.in
===================================================================
--- branches/drbd-0.7/drbd.spec.in 2005-08-24 10:04:18 UTC (rev 1916)
+++ branches/drbd-0.7/drbd.spec.in 2005-08-24 13:21:20 UTC (rev 1917)
@@ -190,6 +190,31 @@
/sbin/depmod -a -F /boot/System.map-%{kernelversion} %{kernelversion} >/dev/null 2>&1 || true
%changelog
+* Wed 24 Aug 2005 15:01:10 +0200 Philipp Reisner <phil at linbit.com>
+- drbd (0.7.12-1)
+ * The /proc/drbd code used a fixed single page buffer. This breaks
+ at about 30 configured devices. Changed that to use the seq_file
+ interface.
+ * Bind the source of TCP connections to the IP address that is
+ mentioned in the configuration.
+ * Fixed a connection flip-flop bug when the two peers used different
+ user provided sizes.
+ * Various fixes in the online-resize code path, including online shrinking
+ and handling the case that the memory allocation for the new bitmap
+ failed.
+ * Random improvements to drbdadm:
+ * The "size" option is now allowed in the disk section
+ * A new "disable-ip-verification" option for the global section
+ * The "disable-io-hints" option is not longer available.
+ * Fixed a potential very unlikely race condition that in the end would
+ trigger an ERR in drbd_actlog.c:607. Actually I never saw this trigger.
+ * Fixed a logic bug in _drbd_process_ee() that, paired with a race condition
+ could trigger a "ASSERT(b->n_req == set_size)" upon disconnect.
+ * Removed the "disable_io_hints" module parameter.
+ * Added the "disable_bd_claim" module parameter, to allow users, WHO
+ KNOW WHAT THEY DO, to read-access the data on the secondary node.
+ * Allow "drbdadm invalidate" only in StandAlone and Connected states.
+
* Tue Jun 7 2005 19:13:00 +0200 Lars Ellenberg <lars at linbit.com>
- drbd (0.7.11-1)
* The upper limit of the runtime tuning parameter max_buffers
Modified: branches/drbd-0.7/scripts/drbd.conf
===================================================================
--- branches/drbd-0.7/scripts/drbd.conf 2005-08-24 10:04:18 UTC (rev 1916)
+++ branches/drbd-0.7/scripts/drbd.conf 2005-08-24 13:21:20 UTC (rev 1917)
@@ -76,18 +76,8 @@
#
# dialog-refresh 5; # 5 seconds
- # this is for people who set up a drbd device via the
- # loopback network interface or between two VMs on the same
- # box, for testing/simulating/presentation
- # otherwise it could trigger a run_tasq_queue deadlock.
- # I'm not sure whether this deadlock can happen with two
- # nodes, but it seems at least extremely unlikely; and since
- # the io_hints boost performance, keep them enabled.
- #
- # With linux 2.6 it no longer makes sense.
- # So this option should vanish. --lge
- #
- # disable-io-hints;
+ # You might disable one of drbdadm's sanity check.
+ # disable-ip-verification;
# }
#
@@ -149,6 +139,11 @@
# continues in disk less mode.
#
on-io-error detach;
+
+ # In case you only want to use a fraction of the available space
+ # you might use the "size" option here.
+ #
+ # size 10G;
}
net {
More information about the drbd-cvs
mailing list