[DRBD-cvs] r1467 - in trunk: . testing/CTH

[drbd-user@lists.linbit.com]

Author: lars
Date: 2004-07-28 17:17:17 +0200 (Wed, 28 Jul 2004)
New Revision: 1467

Modified:
   trunk/testing/CTH/functions.sh
   trunk/upgrade_0.6.x_to_0.7.0.txt
   trunk/upgrade_0.7.0_to_0.7.1.txt
Log:
ispell'ed upgrade*.txt; adjusted functions.sh to allow for group disk

Modified: trunk/testing/CTH/functions.sh
===================================================================
--- trunk/testing/CTH/functions.sh	2004-07-28 15:04:28 UTC (rev 1466)
+++ trunk/testing/CTH/functions.sh	2004-07-28 15:17:17 UTC (rev 1467)
@@ -147,7 +147,7 @@
 	fi
 	> /etc/drbd-07.conf # no more drbd-07.conf hehehe...
 	ls_line=$(LANG= ls -l /dev/${DRBD_DEVNAME}0)
-	egrep_pat="^brw-..---- +1 root +root +$DRBD_MAJOR, +0 [A-Za-z0-9-: ]*/dev/${DRBD_DEVNAME}0\$"
+	egrep_pat="^brw-..---- +1 root +[a-z]+ +$DRBD_MAJOR, +0 [A-Za-z0-9-: ]*/dev/${DRBD_DEVNAME}0\$"
 	if ! echo $ls_line | grep -E "$egrep_pat" ; then
 		echo "unexpected drbd device settings"
 		echo " $ls_line"

Modified: trunk/upgrade_0.6.x_to_0.7.0.txt
===================================================================
--- trunk/upgrade_0.6.x_to_0.7.0.txt	2004-07-28 15:04:28 UTC (rev 1466)
+++ trunk/upgrade_0.6.x_to_0.7.0.txt	2004-07-28 15:17:17 UTC (rev 1467)
@@ -1,8 +1,8 @@
 
 DRBD upgrade instructions from 0.6.x to 0.7.0
 
-* Since drbd-0.7.x is protocol incompatile to drbd-0.6.x you need
-  to do a offline upgrade. I.e. no "rolling" upgrade possible.
+* Since drbd-0.7.x is protocol incompatible to drbd-0.6.x you need
+  to do an offline upgrade. I.e. no "rolling" upgrade possible.
 
   Make sure that the devices are in sync, make both sides secondary
   first and then stop DRBD on both nodes.
@@ -13,9 +13,9 @@
 
   In order to do this upgrade you either need to
 
-   A) shrink your filesystems on the DRBD devices by at least 128MB
-   B) grow the backing_storage of the DRBD devices by at leas 128MB
-   C) have one seperate block_device for all meta data
+   A) shrink your filesystems on the DRBD devices by at least 128MB, or
+   B) grow the backing_storage of the DRBD devices by at least 128MB, or
+   C) have one separate block_device for all meta data
 
   A)
   ext2/ext3   resize2fs
@@ -27,12 +27,12 @@
   (fdisk)     (Only do this if you know what you are doing.)
 
   C)
-  The device needs to be n*128MB, where n is the number of 
-  DRBD resources.
+  The size of the meta-data device needs to be at least n*128MB,
+  where n is the number of DRBD resources you want to use.
 
-* Update you configurate file:
+* Update your configuration file:
   - Change it to the new syntax.
-  - Remove the disk-size parameter from you drbd.conf
+  - Remove the disk-size parameter from your drbd.conf
   - Add the meta-disk settings
   - Remove tl-size
   - Change sync-min & sync-max to sync { rate }
@@ -41,5 +41,5 @@
 * Start DRBD on both nodes
 
 * Tune the al-extents setting to balance the number of updates
-  to the metadata per minute (see cat /proc/drbd umber "al:") vs
+  to the metadata per minute (see cat /proc/drbd number "al:") vs
   the expected resync time. 

Modified: trunk/upgrade_0.7.0_to_0.7.1.txt
===================================================================
--- trunk/upgrade_0.7.0_to_0.7.1.txt	2004-07-28 15:04:28 UTC (rev 1466)
+++ trunk/upgrade_0.7.0_to_0.7.1.txt	2004-07-28 15:17:17 UTC (rev 1467)
@@ -9,12 +9,16 @@
 * Install drbd-0.7.1
 * Run these commands as root:
 
-sed -e "s/\/dev\/nb/\/dev\/drbd/" < /etc/drbd.conf > /etc/drbd.conf_new
+sed -e "s,/dev/nb,/dev/drbd,g" < /etc/drbd.conf > /etc/drbd.conf_new
 mv /etc/drbd.conf /etc/drbd.conf_old ; mv /etc/drbd.conf_new /etc/drbd.conf
-sed -e "s/\/dev\/nb/\/dev\/drbd/" < /etc/fstab > /etc/fstab_new
+sed -e "s,/dev/nb,/dev/drbd,g" < /etc/fstab > /etc/fstab_new
 mv /etc/fstab /etc/fstab_old ; mv /etc/fstab_new /etc/fstab
-for ((i=0;i<16;i++)); do mknod /dev/drbd$i b 147 $i; done
 
+ or alternatively:
+ perl -i_old 's,/dev/nb,/dev/drbd,g' /etc/{drbd.conf,fstab}
+
+for i in `seq 0 15` ; do mknod /dev/drbd$i b 147 $i; done
+
 * /etc/init.d/drbd start
 * migrate all services to the just upgraded node and 
   upgrade the other node.