From 4d825309b8cf27fecf762182fa760073f40fdd9e Mon Sep 17 00:00:00 2001 From: cliffw Date: Thu, 12 Jan 2006 00:19:25 +0000 Subject: [PATCH] Remove lwizard and associated documents --- lustre/doc/Makefile.am | 2 +- lustre/doc/lwizard.1 | 113 --------- lustre/tests/test-lwizard.sh | 45 ---- lustre/utils/Makefile.am | 2 +- lustre/utils/lwizard | 530 ------------------------------------------- 5 files changed, 2 insertions(+), 690 deletions(-) delete mode 100644 lustre/doc/lwizard.1 delete mode 100755 lustre/tests/test-lwizard.sh delete mode 100755 lustre/utils/lwizard diff --git a/lustre/doc/Makefile.am b/lustre/doc/Makefile.am index efe70d2..bcdf268 100644 --- a/lustre/doc/Makefile.am +++ b/lustre/doc/Makefile.am @@ -15,7 +15,7 @@ TEXEXPAND = texexpand SUFFIXES = .lin .lyx .pdf .ps .sgml .html .txt .tex .fig .eps .dvi if UTILS -man_MANS = lfs.1 lmc.1 lwizard.1 lconf.8 lctl.8 +man_MANS = lfs.1 lmc.1 lconf.8 lctl.8 endif LYXFILES= $(filter-out $(patsubst %.lin,%.lyx,$(wildcard *.lin)),\ diff --git a/lustre/doc/lwizard.1 b/lustre/doc/lwizard.1 deleted file mode 100644 index 31339d2..0000000 --- a/lustre/doc/lwizard.1 +++ /dev/null @@ -1,113 +0,0 @@ -.TH lwizard 1 "2003 Oct 29" Lustre "Configuration utilities" -.SH NAME -lwizard \- Lustre configuration wizard -.SH SYNOPSIS -.br -.B lwizard -.br -.B lwizard [--help] -.br -.BR lwizard [-o|--file=CONFIG_FILE][--stripe_size=SIZE][--stripe_cnt=COUNT] -.SH DESCRIPTION -The configuration files for Lustre installation are generally created through a series of lmc commands, this generates an XML file which describes the complete cluster. The lwizard eliminates the need to learn lmc to generate configuration files, instead it achieves the same through asking some simple questions. The -XML configuration file generated using lwizard will still have to be made accessible to all the cluster nodes either by storing it on an LDAP server, NFS or by copying it over to all the involved nodes and then running lconf on all nodes to start up the various Lustre services, device setups or mounting the filesystem. -So, once invoked, lwizard asks a series of questions about the various pieces of the cluster : -.TP -.B MDS hostname -If `hostname' has more than one network interfaces (not including lo) and you dicide to use as many interfaces as possible, you need to specify the interfaces' IP addresses separated by blank space. See below example for how to enter interfaces. -.TP -.B MDS device information -.TP -.B MDS failover information -Failover is optional. if failover is enabled, failover hostname and device name are needed. The failover device MUST be the shared device of MDS device. -.TP -.B OST hostname -This will be asked for every new OST added. You can also specify multiple network interfaces as mentioned above for MDS hostname. -.TP -.B OST device information -This will be asked for every new OST added -.TP -.B OST failover information -Failover is optional. if failover is enabled, failover hostname and device name are needed. The failover device MUST be the shared device of OST device. -.TP -.B Lustre mount-point -This is the Lustre mount-point on the client (default - /mnt/lustre). -.TP -.B Lustre client -By default, Lustre can be mounted on any node. However, by default, Lustre will use only one network interface to communicate with servers. If you want to mount Lustre filesystem on a multi-host node and use many netowork interfaces to communicate, you need to configure it specifically. This will tell Lustre client which interfaces it can use to communicate with servers. See example below for details. - -The wizard saves the XML file to the filename specified using the -o or --file option or the default file config.xml. It will also save the lmc commands used to create the XML file in a script config.sh or .sh. - -The lwizard tool currently assumes the following defaults: - -.TP -.B Network type -tcp -.TP -.B Filesystem type -ext3 -.TP -.B LMC path -.I /usr/sbin/lmc - -.SH EXAMPLES -The example below shows a sample session using lwizard. -.PP -[username@meghna utils]$ ./lwizard --stripe_size=64 --stripe_cnt=2 -.br -This script will help you create a Lustre configuration file. -.br -Creating mds "mds1"... -.br -Please enter the HOSTNAME for mds1: meghna -.br -If meghna has more than one network INTERFACE, enter here, separating them -by blank space. See lwizard man page for help. -.br -(hit enter if only one): 192.168.1.29/24 10.0.0.29/24 -.br -Please enter the device name or loop file name for meghna: /dev/sda1 -.br -Please enter the device SIZE or 0 to use entire device (in KB): -.br -Do you want to configure FAILOVER mds1? y -.br -Please enter the HOSTNAME for failover mds1: lester2 -.br -Please enter the device for failover mds1 on lester2: /dev/sdb2 -.br -Creating ost "ost1"... -.br -Please enter the HOSTNAME for ost1: meghna -.br -If meghna has more than one network INTERFACE, enter here, separating them -by blank space. See lwizard man page for help. -.br -(hit enter if only one): -.br -Please enter the device name or loop file name for meghna: /tmp/ost1 -.br -Please enter the device SIZE or 0 to use entire device (in KB): 10000 -.br -Do you want to configure FAILOVER ost1? -.br -Creating ost "ost2"... -.br -Please enter the HOSTNAME for ost2, or just hit enter to finish: -.br -Please enter the clients' mountpoint (/mnt/lustre): -.br -Do you want to configure another client with multiple network interfaces? y -.br -Please enter the HOSTNAME: client2 -.br -Please enter network interface address (separated by space): 192.168.1.30/24 10.0.0.30/24 -.br -Do you want to configure another client with multiple network interfaces? -.br - mds1 lov1 ost1 client client -.br -The Lustre configuration has been written to lwizard.xml. -.br -.SH BUGS -None are known. diff --git a/lustre/tests/test-lwizard.sh b/lustre/tests/test-lwizard.sh deleted file mode 100755 index 4f86411..0000000 --- a/lustre/tests/test-lwizard.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/expect - -spawn lwizard $argv -HOSTNAME=`hostname` -set timeout 3 -expect { - "overwrite existing" { - interact - } -} -expect "HOSTNAME for mds" -send -- "$HOSTNAME\n" -expect "network INTERFACE" -send -- "192.168.1.29/24 10.0.0.29/24\n" -expect "enter the device or loop file name for mds" -send -- "/tmp/mds\n" -expect "device SIZE" -send -- "10000\n" -expect "configure FAILOVER" -send -- "n\n" -expect "HOSTNAME for ost" -send -- "$HOSTNAME\n" -expect "network INTERFACE" -send -- "192.168.1.29/24 10.0.0.29/24\n" -expect "device or loop file name for ost" -send -- "/tmp/ost\n" -expect "device SIZE" -send -- "10000\n" -expect "configure FAILOVER" -send -- "n\n" -expect "HOSTNAME for ost" -send -- "\n" -expect "clients' mountpoint" -send -- "\n" -expect "configure another client with multiple network interfaces" -send -- "y\n" -expect "HOSTNAME" -send -- "node\n" -expect "network interface address" -send -- "192.168.1.29/24 10.0.0.29/24\n" -expect "configure another client with multiple network interfaces" -send -- "n\n" -expect "Lustre configuration has been written" -send -- "\n" -close diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am index d4dbb5b..144dbcb 100644 --- a/lustre/utils/Makefile.am +++ b/lustre/utils/Makefile.am @@ -9,7 +9,7 @@ AM_LDFLAGS := -L$(top_builddir)/lnet/utils LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a sbin_scripts = lconf lmc llanalyze llstat.pl llobdstat.pl lactive \ - load_ldap.sh lrun lwizard + load_ldap.sh lrun bin_scripts = lfind lstripe if UTILS diff --git a/lustre/utils/lwizard b/lustre/utils/lwizard deleted file mode 100755 index fa85240..0000000 --- a/lustre/utils/lwizard +++ /dev/null @@ -1,530 +0,0 @@ -#!/bin/sh -# Copyright (C) 2003 Cluster File Systems, Inc. -# Create a Lustre configuration file -# -# Usage: lwizard -# -# Jerrifer -# wangdi - -# fatal error to exit -fatal() -{ - if [ "$#" -gt "1" ]; then - echo - echo "$2" - exit 1 - fi - - exit 1 -} - -#print usage and exit -usage() -{ - cat <> "$LMC_BATCH_FILE" -} - -# following user input to create xml config file -create_config() -{ - local extraopt="" - - for device in $DEVICE_LIST ; do - get_name_in_list $device - echo -n " $DEVICE_NAME" - - case $DEVICE_NAME in - mds*) - add_node "$HOST_NAME" "$INTERFACES" - extraopt="" - if [ "$FAILOVER_HOST" != "" ] ; then - extraopt=" --failover --group $HOST_NAME" - fi - - run_lmc --add mds \ - --node "$HOST_NAME" \ - --mds "$DEVICE_NAME" \ - --dev "$DEVICE" \ - --size "$DEVICE_SIZE" \ - --fstype "$DEFAULT_FSTYPE" \ - $extraopt - if [ "$FAILOVER_HOST" != "" ] ; then - add_node "$FAILOVER_HOST" - run_lmc --add mds \ - --node "$FAILOVER_HOST" \ - --mds "$DEVICE_NAME" \ - --dev "$FAILOVER_DEVICE" \ - --size "$DEVICE_SIZE" \ - --fstype "$DEFAULT_FSTYPE" \ - --failover \ - --group "$HOST_NAME" - fi - ;; - lov*) - run_lmc --add lov \ - --lov "$DEVICE_NAME" \ - --mds "$DEVICE_MDS" \ - --stripe_sz "$STRIPE_SIZE" \ - --stripe_cnt "$STRIPE_CNT" \ - --stripe_pattern "$STRIPE_PATTERN" - ;; - ost*) - add_node "$HOST_NAME" "$INTERFACES" - extraopt="" - if [ "$FAILOVER_HOST" != "" ] ; then - extraopt=" --failover --group $HOST_NAME" - fi - run_lmc --add ost \ - --node "$HOST_NAME" \ - --ost "$DEVICE_NAME" \ - --lov "$DEVICE_LOV" \ - --dev "$DEVICE" \ - --size "$DEVICE_SIZE" \ - --fstype "$DEFAULT_FSTYPE" \ - $extraopt - if [ "$FAILOVER_HOST" != "" ] ; then - add_node "$FAILOVER_HOST" - run_lmc --add ost \ - --node "$FAILOVER_HOST" \ - --ost "$DEVICE_NAME" \ - --lov "$DEVICE_LOV" \ - --dev "$FAILOVER_DEVICE" \ - --size "$DEVICE_SIZE" \ - --fstype "$DEFAULT_FSTYPE" \ - --failover \ - --group "$HOST_NAME" - fi - ;; - client*) - if [ "$INTERFACES" ] ; then - add_node "$HOST_NAME" "$INTERFACES" - run_lmc --add mtpt \ - --node "$HOST_NAME" \ - --mds "$DEVICE_MDS" \ - --lov "$DEVICE_LOV" \ - --path "$DEVICE" \ - # --clientoptions "async" - - else - add_client_node "$DEVICE_NAME" - run_lmc --add mtpt \ - --node "$DEVICE_NAME" \ - --mds "$DEVICE_MDS" \ - --lov "$DEVICE_LOV" \ - --path "$DEVICE" \ - # --clientoptions "async" - fi - ;; - esac - done - - echo - return 0 -} - -maybe_clean() -{ - [ -f "$1" ] || return 0 - if ! (( $FORCE )) ; then - echo -n "${0##*/}: overwrite existing $2 \"$1\"? " - read answer - if ! [ "${answer:0:1}" = "y" -o "${answer:0:1}" = "Y" ] ; then - echo "(${0##*/}: (Exiting.)" - exit 0 - fi - fi - rm -f "$1" -} - -# parse options -get_option "$@" - -# some default definitions -LMC=${LMC:-"/usr/sbin/lmc"} - -CONFIG_FILE=${CONFIG_FILE:-"lwizard.xml"} - -# Remove exiting files. - -maybe_clean "$CONFIG_FILE" "Lustre configuration file" -if [ "$LMC_BATCH_FILE" ] ; then - maybe_clean "$LMC_BATCH_FILE" "lmc batch file" -else - LMC_BATCH_FILE=$(mktemp -q "/tmp/${CONFIG_FILE##*/}.XXXXXX") - [ $? -eq 0 ] || fatal 1 "Couldn't create temporary batch file." -fi - -DEFAULT_FSTYPE=${DEFAULT_FSTYPE:-"ext3"} -DEFAULT_NETTYPE=${DEFAULT_NETTYPE:-"tcp"} -DEFAULT_MNTPT=${DEFAULT_MNTPT:-"/mnt/lustre"} - -STRIPE_SIZE=${STRIPE_SIZE:-$((1 * 1024 * 1024))} -STRIPE_CNT=${STRIPE_CNT:-1} -STRIPE_PATTERN=${STRIPE_PATTERN:-0} - -ANSWER="yes no" - -CURRENT_LOV= -MDS_LIST= -OST_LIST= -CLIENT_LIST= - -# print program information -cat <