Skip to content
Snippets Groups Projects
Commit 87d92f4a authored by Eric Mei's avatar Eric Mei
Browse files

adjust krb5 related scripts, add krb5 support in replay-ost-single, 

sanityN, sanity-ldlm.
parent 0d482256
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 37 additions and 75 deletions
lustre/tests/llmount.sh
+ 5
− 9
View file @ 87d92f4a
...@@ -13,6 +13,8 @@ mkconfig=$(dirname $0)/$NAME.sh ...@@ -13,6 +13,8 @@ mkconfig=$(dirname $0)/$NAME.sh
. krb5_env.sh . krb5_env.sh
start_krb5_kdc || exit 1 start_krb5_kdc || exit 1
start_lsvcgssd || exit 2
start_lgssd || exit 3
if [ "$PORTALS" ]; then if [ "$PORTALS" ]; then
portals_opt="--portals=$PORTALS" portals_opt="--portals=$PORTALS"
...@@ -25,23 +27,17 @@ fi ...@@ -25,23 +27,17 @@ fi
if [ "$LDAPURL" ]; then if [ "$LDAPURL" ]; then
conf_opt="--ldapurl $LDAPURL --config $NAME" conf_opt="--ldapurl $LDAPURL --config $NAME"
else else
sh $mkconfig $config || exit 2 sh $mkconfig $config || exit 4
conf_opt="$config" conf_opt="$config"
fi fi
[ "$NODE" ] && node_opt="--node $NODE" [ "$NODE" ] && node_opt="--node $NODE"
[ "$DEBUG" ] && debug_opt="--ptldebug=$DEBUG" [ "$DEBUG" ] && debug_opt="--ptldebug=$DEBUG"
# We'd better start lsvcgssd after gss modules loaded.
# remove this if we don't depend on lsvcgssd in the future
${LCONF} --nosetup --sec $SECURITY $portals_opt $node_opt $@ $conf_opt || exit 3
start_lsvcgssd || exit 4
start_lgssd || exit 5
${LCONF} $NOMOD --sec $SECURITY $portals_opt $lustre_opt $node_opt \ ${LCONF} $NOMOD --sec $SECURITY $portals_opt $lustre_opt $node_opt \
${REFORMAT:---reformat} $@ $conf_opt || exit 6 ${REFORMAT:---reformat} $@ $conf_opt || exit 5
if [ "$MOUNT2" ]; then if [ "$MOUNT2" ]; then
$LLMOUNT -v -o sec=$SECURITY `hostname`:/mds1/client $MOUNT2 || exit 7 $LLMOUNT -v -o sec=$SECURITY `hostname`:/mds1/client $MOUNT2 || exit 6
fi fi
lustre/tests/llrmount.sh
+ 5
− 9
View file @ 87d92f4a
...@@ -13,6 +13,8 @@ mkconfig=$NAME.sh ...@@ -13,6 +13,8 @@ mkconfig=$NAME.sh
. krb5_env.sh . krb5_env.sh
start_krb5_kdc || exit 1 start_krb5_kdc || exit 1
start_lsvcgssd || exit 2
start_lgssd || exit 3
if [ "$PORTALS" ]; then if [ "$PORTALS" ]; then
portals_opt="--portals=$PORTALS" portals_opt="--portals=$PORTALS"
...@@ -26,23 +28,17 @@ if [ "$LDAPURL" ]; then ...@@ -26,23 +28,17 @@ if [ "$LDAPURL" ]; then
conf_opt="--ldapurl $LDAPURL --config $NAME" conf_opt="--ldapurl $LDAPURL --config $NAME"
else else
if [ ! -f $config -o $mkconfig -nt $config ]; then if [ ! -f $config -o $mkconfig -nt $config ]; then
sh $mkconfig $config || exit 2 sh $mkconfig $config || exit 4
fi fi
conf_opt="$config" conf_opt="$config"
fi fi
[ "$NODE" ] && node_opt="--node $NODE" [ "$NODE" ] && node_opt="--node $NODE"
# We'd better start lsvcgssd after gss modules loaded.
# remove this if we don't depend on lsvcgssd in the future
${LCONF} --nosetup --sec $SECURITY $portals_opt $node_opt $@ $conf_opt || exit 3
start_lsvcgssd || exit 4
start_lgssd || exit 5
${LCONF} $NOMOD --sec $SECURITY $portals_opt $lustre_opt $node_opt \ ${LCONF} $NOMOD --sec $SECURITY $portals_opt $lustre_opt $node_opt \
$@ $conf_opt || exit 6 $@ $conf_opt || exit 5
if [ "$MOUNT2" ]; then if [ "$MOUNT2" ]; then
$LLMOUNT -v -o sec=$SECURITY `hostname`:/mds1/client $MOUNT2 || exit 7 $LLMOUNT -v -o sec=$SECURITY `hostname`:/mds1/client $MOUNT2 || exit 6
fi fi
lustre/tests/recovery-small.sh
+ 4
− 4
View file @ 87d92f4a
...@@ -51,10 +51,10 @@ gen_config() { ...@@ -51,10 +51,10 @@ gen_config() {
setup() { setup() {
gen_config gen_config
start_krb5_kdc || exit 1 start_krb5_kdc || exit 1
start ost --reformat $OSTLCONFARGS
start ost2 --reformat $OSTLCONFARGS
start_lsvcgssd || exit 2 start_lsvcgssd || exit 2
start_lgssd || exit 3 start_lgssd || exit 3
start ost --reformat $OSTLCONFARGS
start ost2 --reformat $OSTLCONFARGS
[ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
for mds in `mds_list`; do for mds in `mds_list`; do
start $mds --reformat $MDSLCONFARGS start $mds --reformat $MDSLCONFARGS
...@@ -67,10 +67,10 @@ cleanup() { ...@@ -67,10 +67,10 @@ cleanup() {
for mds in `mds_list`; do for mds in `mds_list`; do
stop $mds ${FORCE} $MDSLCONFARGS stop $mds ${FORCE} $MDSLCONFARGS
done done
stop_lgssd
stop_lsvcgssd
stop ost2 ${FORCE} --dump cleanup.log stop ost2 ${FORCE} --dump cleanup.log
stop ost ${FORCE} --dump cleanup.log stop ost ${FORCE} --dump cleanup.log
stop_lgssd
stop_lsvcgssd
} }
if [ ! -z "$EVAL" ]; then if [ ! -z "$EVAL" ]; then
......
lustre/tests/replay-dual.sh
+ 4
− 4
View file @ 87d92f4a
...@@ -63,10 +63,10 @@ cleanup() { ...@@ -63,10 +63,10 @@ cleanup() {
sleep 5 sleep 5
stop $mds ${FORCE} $MDSLCONFARGS stop $mds ${FORCE} $MDSLCONFARGS
done done
stop_lgssd
stop_lsvcgssd
stop ost2 ${FORCE} stop ost2 ${FORCE}
stop ost ${FORCE} --dump cleanup-dual.log stop ost ${FORCE} --dump cleanup-dual.log
stop_lgssd
stop_lsvcgssd
} }
if [ "$ONLY" == "cleanup" ]; then if [ "$ONLY" == "cleanup" ]; then
...@@ -79,6 +79,8 @@ setup() { ...@@ -79,6 +79,8 @@ setup() {
gen_config gen_config
start_krb5_kdc || exit 1 start_krb5_kdc || exit 1
start_lsvcgssd || exit 2
start_lgssd || exit 3
start ost --reformat $OSTLCONFARGS start ost --reformat $OSTLCONFARGS
PINGER=`cat /proc/fs/lustre/pinger` PINGER=`cat /proc/fs/lustre/pinger`
...@@ -89,8 +91,6 @@ setup() { ...@@ -89,8 +91,6 @@ setup() {
fi fi
start ost2 --reformat $OSTLCONFARGS start ost2 --reformat $OSTLCONFARGS
start_lsvcgssd || exit 2
start_lgssd || exit 3
[ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
for mds in `mds_list`; do for mds in `mds_list`; do
start $mds --reformat $MDSLCONFARGS start $mds --reformat $MDSLCONFARGS
......
lustre/tests/replay-ost-single.sh
+ 5
− 0
View file @ 87d92f4a
...@@ -53,6 +53,8 @@ cleanup() { ...@@ -53,6 +53,8 @@ cleanup() {
stop $mds ${FORCE} $MDSLCONFARGS stop $mds ${FORCE} $MDSLCONFARGS
done done
stop ost ${FORCE} --dump cleanup.log stop ost ${FORCE} --dump cleanup.log
stop_lgssd
stop_lsvcgssd
} }
if [ "$ONLY" == "cleanup" ]; then if [ "$ONLY" == "cleanup" ]; then
...@@ -69,6 +71,9 @@ CLEANUP=${CLEANUP:-"cleanup"} ...@@ -69,6 +71,9 @@ CLEANUP=${CLEANUP:-"cleanup"}
setup() { setup() {
gen_config gen_config
start_krb5_kdc || exit 1
start_lsvcgssd || exit 2
start_lgssd || exit 3
start ost --reformat $OSTLCONFARGS start ost --reformat $OSTLCONFARGS
[ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
for mds in `mds_list`; do for mds in `mds_list`; do
......
lustre/tests/replay-single.sh
+ 4
− 4
View file @ 87d92f4a
...@@ -66,10 +66,10 @@ cleanup() { ...@@ -66,10 +66,10 @@ cleanup() {
for mds in `mds_list`; do for mds in `mds_list`; do
stop $mds ${FORCE} $MDSLCONFARGS stop $mds ${FORCE} $MDSLCONFARGS
done done
stop_lgssd
stop_lsvcgssd
stop ost2 ${FORCE} --dump cleanup.log stop ost2 ${FORCE} --dump cleanup.log
stop ost ${FORCE} --dump cleanup.log stop ost ${FORCE} --dump cleanup.log
stop_lgssd
stop_lsvcgssd
} }
if [ "$ONLY" == "cleanup" ]; then if [ "$ONLY" == "cleanup" ]; then
...@@ -85,10 +85,10 @@ setup() { ...@@ -85,10 +85,10 @@ setup() {
gen_config gen_config
start_krb5_kdc || exit 1 start_krb5_kdc || exit 1
start ost --reformat $OSTLCONFARGS
start ost2 --reformat $OSTLCONFARGS
start_lsvcgssd || exit 2 start_lsvcgssd || exit 2
start_lgssd || exit 3 start_lgssd || exit 3
start ost --reformat $OSTLCONFARGS
start ost2 --reformat $OSTLCONFARGS
[ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
for mds in `mds_list`; do for mds in `mds_list`; do
start $mds --reformat $MDSLCONFARGS start $mds --reformat $MDSLCONFARGS
......
lustre/tests/sanity-fid.sh
+ 0
− 15
View file @ 87d92f4a
...@@ -37,21 +37,6 @@ MODE=${MODE:mds} ...@@ -37,21 +37,6 @@ MODE=${MODE:mds}
. krb5_env.sh . krb5_env.sh
if [ $UID -ne 0 ]; then
RUNAS_ID="$UID"
RUNAS=""
else
RUNAS_ID=${RUNAS_ID:-500}
RUNAS=${RUNAS:-"runas -u $RUNAS_ID"}
fi
if [ `using_krb5_sec $SECURITY` == 'y' ] ; then
start_krb5_kdc || exit 1
if [ $RUNAS_ID -ne $UID ]; then
$RUNAS ./krb5_refresh_cache.sh || exit 2
fi
fi
export NAME=${NAME:-local} export NAME=${NAME:-local}
SAVE_PWD=$PWD SAVE_PWD=$PWD
......
lustre/tests/sanity-gns.sh
+ 0
− 15
View file @ 87d92f4a
...@@ -38,21 +38,6 @@ PTLDEBUG=${PTLDEBUG:-0} ...@@ -38,21 +38,6 @@ PTLDEBUG=${PTLDEBUG:-0}
. krb5_env.sh . krb5_env.sh
if [ $UID -ne 0 ]; then
RUNAS_ID="$UID"
RUNAS=""
else
RUNAS_ID=${RUNAS_ID:-500}
RUNAS=${RUNAS:-"runas -u $RUNAS_ID"}
fi
if [ `using_krb5_sec $SECURITY` == 'y' ] ; then
start_krb5_kdc || exit 1
if [ $RUNAS_ID -ne $UID ]; then
$RUNAS ./krb5_refresh_cache.sh || exit 2
fi
fi
export NAME=${NAME:-local} export NAME=${NAME:-local}
SAVE_PWD=$PWD SAVE_PWD=$PWD
......
lustre/tests/sanity-ldlm.sh
+ 1
− 0
View file @ 87d92f4a
...@@ -8,6 +8,7 @@ PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$PATH ...@@ -8,6 +8,7 @@ PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$PATH
MOUNT=${MOUNT:-/mnt/lustre} MOUNT=${MOUNT:-/mnt/lustre}
DIR=${DIR:-$MOUNT} DIR=${DIR:-$MOUNT}
export NAME=$NAME export NAME=$NAME
. krb5_env.sh
clean() { clean() {
echo -n "cln.." echo -n "cln.."
sh llmountcleanup.sh > /dev/null || exit 20 sh llmountcleanup.sh > /dev/null || exit 20
......
lustre/tests/sanity-lmv.sh
+ 0
− 15
View file @ 87d92f4a
...@@ -44,21 +44,6 @@ PTLDEBUG=${PTLDEBUG:-0} ...@@ -44,21 +44,6 @@ PTLDEBUG=${PTLDEBUG:-0}
. krb5_env.sh . krb5_env.sh
if [ $UID -ne 0 ]; then
RUNAS_ID="$UID"
RUNAS=""
else
RUNAS_ID=${RUNAS_ID:-500}
RUNAS=${RUNAS:-"runas -u $RUNAS_ID"}
fi
if [ `using_krb5_sec $SECURITY` == 'y' ] ; then
start_krb5_kdc || exit 1
if [ $RUNAS_ID -ne $UID ]; then
$RUNAS ./krb5_refresh_cache.sh || exit 2
fi
fi
export NAME=${NAME:-lmv} export NAME=${NAME:-lmv}
SAVE_PWD=$PWD SAVE_PWD=$PWD
......
lustre/tests/sanityN.sh
+ 9
− 0
View file @ 87d92f4a
...@@ -24,6 +24,8 @@ TOEXCL=${TOEXCL:-toexcl} ...@@ -24,6 +24,8 @@ TOEXCL=${TOEXCL:-toexcl}
TRUNCATE=${TRUNCATE:-truncate} TRUNCATE=${TRUNCATE:-truncate}
export TMP=${TMP:-/tmp} export TMP=${TMP:-/tmp}
. krb5_env.sh
if [ $UID -ne 0 ]; then if [ $UID -ne 0 ]; then
RUNAS_ID="$UID" RUNAS_ID="$UID"
RUNAS="" RUNAS=""
...@@ -32,6 +34,13 @@ else ...@@ -32,6 +34,13 @@ else
RUNAS=${RUNAS:-"runas -u $RUNAS_ID"} RUNAS=${RUNAS:-"runas -u $RUNAS_ID"}
fi fi
if [ `using_krb5_sec $SECURITY` == 'y' ] ; then
start_krb5_kdc || exit 1
if [ $RUNAS_ID -ne $UID ]; then
$RUNAS ./krb5_refresh_cache.sh || exit 2
fi
fi
SAVE_PWD=$PWD SAVE_PWD=$PWD
clean() { clean() {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

https://git.gsi.de is provided by CIT→Linux&Web | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy