[kernel] r9994 - dists/trunk/redhat-cluster/redhat-cluster/debian
Frederik Schüler
fs at alioth.debian.org
Thu Dec 20 20:24:45 UTC 2007
Author: fs
Date: Thu Dec 20 20:24:45 2007
New Revision: 9994
Log:
Provide upgrade handling from version 1.03 in etch.
Do not depend on redhat-cluster-modules, have gfs-tools and gnbd-client recommend it instead.
Modified:
dists/trunk/redhat-cluster/redhat-cluster/debian/cman.config
dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst
dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates
dists/trunk/redhat-cluster/redhat-cluster/debian/control
dists/trunk/redhat-cluster/redhat-cluster/debian/upgrade.txt
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.config
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.config (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.config Thu Dec 20 20:24:45 2007
@@ -5,18 +5,22 @@
. /usr/share/debconf/confmodule
db_version 2.0
-if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.0; then
- db_fget cman/upgrade-from-old seen_in_2.0_upgrade
- if [ "$RET" = false ]; then
- db_fset cman/upgrade-from-old seen false
- db_input critical cman/upgrade-from-old || CODE=$?
- if [ "$CODE" = 30 ]; then
- # non-interactive upgrade. Better die here than sorry.
- exit 1
+case $1 in
+ upgrade)
+ if dpkg --compare-versions "$2" lt 2.0; then
+ db_fget cman/upgrade-warning seen_in_2.0_upgrade
+ if [ "$RET" = false ]; then
+ db_fset cman/upgrade-warning seen false
+ db_input critical cman/upgrade-warning || CODE=$?
+ if [ "$CODE" = 30 ]; then
+ # non-interactive upgrade. Better die here than sorry.
+ exit 1
+ fi
+ db_go || true
+ db_fset cman/upgrade-warning seen_in_2.0_upgrade true
+ fi
fi
- db_go || true
- db_fset cman/upgrade-from-old seen_in_2.0_upgrade true
- fi
-fi
+ ;;
+esac
exit 0
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst Thu Dec 20 20:24:45 2007
@@ -2,17 +2,20 @@
set -e
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.0; then
- db_get cman/upgrade-from-old
- ANSWER="$RET"
- db_fset cman/upgrade-from-old seen_in_2.0_upgrade false
- if [ "$ANSWER" = false ]; then
- exit 1
- fi
-fi
+case $1 in
+ upgrade)
+ . /usr/share/debconf/confmodule
+ db_version 2.0
+ if dpkg --compare-versions "$2" lt 2.0 ; then
+ db_fset cman/upgrade-warning seen_in_2.0_upgrade false
+ db_get cman/upgrade-warning
+ if [ "$RET" = "false" ] ; then
+ echo "aborting cman installation."
+ exit 1
+ fi
+ fi
+ ;;
+esac
#DEBHELPER#
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates Thu Dec 20 20:24:45 2007
@@ -1,13 +1,17 @@
-Template: cman/upgrade-from-old
+Template: cman/upgrade-warning
Type: boolean
Default: false
-_Description: Really upgrade Cluster Manager?
- An older version of cman installed on the system.
+_Description: Really upgrade the Red Hat Cluster Suite?
+ An older version of the Red Hat Cluster Suite is installed on the
+ system.
.
- The version that is going to be installed is *NOT* compatible with the old
- one and will break the cluster horribly if not upgraded properly.
+ WARNING: The version of cman that is going to be installed is not
+ compatible with the currently installed one, upgrading single nodes
+ without stopping the complete cluster will cause data loss.
.
- Check https://wiki.debian.org/UpgradingClusterProcedure for the latest
- instructions on how to proceed.
+ In order to upgrade the cluster suite, you need to follow the
+ instructions found on the following Page:
.
- Select OK if you wish to continue with the upgrade.
+ http://wiki.debian.org/UpgradeRHCSV1toV2
+ .
+ Select OK if you still wish to continue with the upgrade.
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/control Thu Dec 20 20:24:45 2007
@@ -11,7 +11,7 @@
Section: admin
Priority: optional
Architecture: all
-Depends: cman, gfs-tools, gfs2-tools, rgmanager, clvm, redhat-cluster-modules
+Depends: cman, gfs-tools, gfs2-tools, rgmanager, clvm
Description: Red Hat cluster suite (meta package)
The only scope for this package is to install the full Red Hat Cluster Suite
in one shot. It is safe to remove it.
@@ -20,7 +20,7 @@
Architecture: any
Section: admin
Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, python, openais (>= 0.82-2), redhat-cluster-modules
+Depends: ${shlibs:Depends}, python, openais (>= 0.82-2)
Conflicts: magma, libmagma1, libmagma-dev, ccs, fence, libiddev-dev, fence-gnbd, gulm, libgulm1, libgulm-dev, magma-plugins
Replaces: ccs, fence, fence-gnbd
Description: cluster manager
@@ -75,7 +75,8 @@
Package: gfs-tools
Architecture: any
-Depends: ${shlibs:Depends}, psmisc, redhat-cluster-modules, gfs2-tools
+Depends: ${shlibs:Depends}, psmisc, gfs2-tools
+Recommends: redhat-cluster-modules
Section: admin
Description: global file system tools
The Global File System allows a cluster of machines to concurrently access
@@ -92,7 +93,7 @@
Package: gfs2-tools
Architecture: any
-Depends: ${shlibs:Depends}, psmisc, redhat-cluster-modules
+Depends: ${shlibs:Depends}, psmisc
Section: admin
Description: global file system 2 tools (EXPERIMENTAL)
The Global File System 2 allows a cluster of machines to concurrently access
@@ -108,8 +109,8 @@
Package: gnbd-client
Section: admin
Architecture: any
-Depends: ${shlibs:Depends}, redhat-cluster-modules
-Recommends: fence-gnbd (= ${binary:Version})
+Depends: ${shlibs:Depends}
+Recommends: fence-gnbd (= ${binary:Version}), redhat-cluster-modules
Description: global network block device - client tools
GNBD allows to use block devices over the network. It is a modified
version of the linux network block device for the use within a cluster
@@ -120,7 +121,7 @@
Package: gnbd-server
Section: admin
Architecture: any
-Depends: ${shlibs:Depends}, redhat-cluster-modules
+Depends: ${shlibs:Depends}
Recommends: fence-gnbd (= ${binary:Version})
Description: global network block device - server tools
GNBD allows to use block devices over the network. It is a modified
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/upgrade.txt
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/upgrade.txt (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/upgrade.txt Thu Dec 20 20:24:45 2007
@@ -96,46 +96,6 @@
is recommended only for experimental setups.
-Now the cluster is migrated, and should look like this:
-
-node01:/# cman_tool status
-Version: 6.1.0
-Config Version: 1
-Cluster Name: whatever
-Cluster Id: 1337
-Cluster Member: Yes
-Cluster Generation: 12
-Membership state: Cluster-Member
-Nodes: 3
-Expected votes: 2
-Total votes: 3
-Quorum: 2
-Active subsystems: 8
-Flags: Dirty
-Ports Bound: 0 11
-Node name: node01
-Node ID: 1
-Multicast addresses: 224.16.1.10
-Node addresses: 172.16.1.10
-
-node01:/# cman_tool nodes
-Node Sts Inc Joined Name
- 1 M 4 2007-12-10 15:33:03 node01
- 2 M 12 2007-12-10 15:33:04 node02
- 3 M 12 2007-12-10 15:33:04 node03
-
-node01:/# cman_tool services
-type level name id state
-fence 0 default 00010003 none
-[1 2 3]
-dlm 1 clvmd 00020003 none
-[1 2 3]
-dlm 1 docroot 00020001 none
-[1 2 3]
-gfs 2 docroot 00010001 none
-[1 2 3]
-
-
TODO
----
- custom kernels: patch required
More information about the Kernel-svn-changes
mailing list