| 1 |
xmerlin 08/11/22 01:16:59 |
| 2 |
|
| 3 |
Modified: clvmd.rc clvmd.confd |
| 4 |
Log: |
| 5 |
Merged an improved init script. |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.6 sys-fs/clvm/files/clvmd.rc |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/clvmd.rc?rev=1.6&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/clvmd.rc?rev=1.6&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/clvmd.rc?r1=1.5&r2=1.6 |
| 14 |
|
| 15 |
Index: clvmd.rc |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/clvmd.rc,v |
| 18 |
retrieving revision 1.5 |
| 19 |
retrieving revision 1.6 |
| 20 |
diff -u -r1.5 -r1.6 |
| 21 |
--- clvmd.rc 21 Nov 2008 23:31:44 -0000 1.5 |
| 22 |
+++ clvmd.rc 22 Nov 2008 01:16:59 -0000 1.6 |
| 23 |
@@ -1,11 +1,12 @@ |
| 24 |
#!/sbin/runscript |
| 25 |
# Copyright 1999-2005 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/clvmd.rc,v 1.5 2008/11/21 23:31:44 xmerlin Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/clvmd.rc,v 1.6 2008/11/22 01:16:59 xmerlin Exp $ |
| 29 |
|
| 30 |
[ -x /usr/sbin/clvmd ] && CLVMD_BIN="/usr/sbin/clvmd" || CLVMD_BIN="/sbin/clvmd" |
| 31 |
|
| 32 |
[ -z "$CLVMD_CLUSTER_TIMEOUT" ] && CLVMD_CLUSTER_TIMEOUT=30 |
| 33 |
+[ -n "$CLVMD_NODES_TIMEOUT" ] || CLVMD_NODES_TIMEOUT=60 |
| 34 |
|
| 35 |
VGCHANGE="/sbin/vgchange" |
| 36 |
VGSCAN="/sbin/vgscan" |
| 37 |
@@ -70,56 +71,43 @@ |
| 38 |
fi |
| 39 |
} |
| 40 |
|
| 41 |
-start_volumes() { |
| 42 |
- ebegin "Scanning LVM volumes" |
| 43 |
- $VGSCAN &>/dev/null |
| 44 |
|
| 45 |
- ret=$? |
| 46 |
+start_volumes() { |
| 47 |
+ ebegin "Scanning LVM volumes" |
| 48 |
+ $VGSCAN > /dev/null 2>&1 |
| 49 |
+ eend $? |
| 50 |
|
| 51 |
+ ret=$? |
| 52 |
if [ "$ret" -eq 5 ] |
| 53 |
then |
| 54 |
- einfo " ...initialization delayed." |
| 55 |
- eend 0 |
| 56 |
- else |
| 57 |
- eend 0 |
| 58 |
- |
| 59 |
- if [ -n "$LVM_VGS" ] |
| 60 |
- then |
| 61 |
- for vg in $LVM_VGS |
| 62 |
- do |
| 63 |
- ebegin " Activating VG: ${vg} " |
| 64 |
- $VGCHANGE -ayl ${vg} >/dev/null |
| 65 |
- eend $? |
| 66 |
- done |
| 67 |
- else |
| 68 |
- clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'` |
| 69 |
- for vg in $clustervgs; do |
| 70 |
- ebegin " Activating Clustered VG: ${vg} " |
| 71 |
- $VGCHANGE -ayl ${vg} >/dev/null |
| 72 |
- eend $? |
| 73 |
- done |
| 74 |
- fi |
| 75 |
+ einfo " Waiting for other nodes to join the cluster ($CLVMD_NODES_TIMEOUT seconds)" |
| 76 |
fi |
| 77 |
+ |
| 78 |
+ clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'` |
| 79 |
+ for vg in $clustervgs; do |
| 80 |
+ ebegin " Activating Clustered VG: ${vg} " |
| 81 |
+ |
| 82 |
+ wait=0 |
| 83 |
+ while [ -n "$($VGCHANGE -a y ${vg} 2>&1 |grep "clvmd not running")" ]; do |
| 84 |
+ if [ $wait -lt $CLVMD_NODES_TIMEOUT ]; then |
| 85 |
+ sleep 3 |
| 86 |
+ wait=$(($wait + 3)) |
| 87 |
+ else |
| 88 |
+ eend 1 |
| 89 |
+ fi |
| 90 |
+ done |
| 91 |
+ eend 0 |
| 92 |
+ done |
| 93 |
} |
| 94 |
|
| 95 |
stop_volumes() { |
| 96 |
- if [ -n "$LVM_VGS" ] |
| 97 |
- then |
| 98 |
- for vg in $LVM_VGS |
| 99 |
- do |
| 100 |
- ebegin " Shutting Down VG: ${vg} " |
| 101 |
- $VGCHANGE -anl ${vg} >/dev/null |
| 102 |
- eend $? |
| 103 |
- done |
| 104 |
- else |
| 105 |
- # Deactivate only clustered volumes |
| 106 |
- clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'` |
| 107 |
- for vg in $clustervgs; do |
| 108 |
- ebegin " Shutting Down Clustered VG: ${vg} " |
| 109 |
- $VGCHANGE -anl ${vg} >/dev/null |
| 110 |
- eend $? |
| 111 |
- done |
| 112 |
- fi |
| 113 |
+ # Deactivate only clustered volumes |
| 114 |
+ clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'` |
| 115 |
+ for vg in $clustervgs; do |
| 116 |
+ ebegin " Shutting Down Clustered VG: ${vg} " |
| 117 |
+ $VGCHANGE -anl ${vg} >/dev/null |
| 118 |
+ eend $? |
| 119 |
+ done |
| 120 |
} |
| 121 |
|
| 122 |
|
| 123 |
@@ -136,7 +124,7 @@ |
| 124 |
start-stop-daemon --start --quiet --exec ${CLVMD_BIN} -- -T ${CLVMD_CLUSTER_TIMEOUT} |
| 125 |
eend $? |
| 126 |
|
| 127 |
- #start_volumes |
| 128 |
+ start_volumes |
| 129 |
} |
| 130 |
|
| 131 |
stop() { |
| 132 |
|
| 133 |
|
| 134 |
|
| 135 |
1.2 sys-fs/clvm/files/clvmd.confd |
| 136 |
|
| 137 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/clvmd.confd?rev=1.2&view=markup |
| 138 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/clvmd.confd?rev=1.2&content-type=text/plain |
| 139 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/clvmd.confd?r1=1.1&r2=1.2 |
| 140 |
|
| 141 |
Index: clvmd.confd |
| 142 |
=================================================================== |
| 143 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/clvmd.confd,v |
| 144 |
retrieving revision 1.1 |
| 145 |
retrieving revision 1.2 |
| 146 |
diff -u -r1.1 -r1.2 |
| 147 |
--- clvmd.confd 21 Nov 2008 23:31:44 -0000 1.1 |
| 148 |
+++ clvmd.confd 22 Nov 2008 01:16:59 -0000 1.2 |
| 149 |
@@ -1,3 +1,9 @@ |
| 150 |
# CLVMD_CLUSTER_TIMEOUT -- amount of time to wait for cluster quorum. |
| 151 |
|
| 152 |
CLVMD_CLUSTER_TIMEOUT=30 |
| 153 |
+ |
| 154 |
+ |
| 155 |
+# CLVMD_NODES_TIMEOUT -- amount of time to wait for the other nodes to |
| 156 |
+# join the cluster. |
| 157 |
+ |
| 158 |
+CLVMD_NODES_TIMEOUT=60 |
Archives