Skip to content

Commit bcdbb9e

Browse files
committed
Fix bugs with phys_rep_perf testcase
Signed-off-by: Mark Hannum <[email protected]>
1 parent b10d094 commit bcdbb9e

File tree

1 file changed

+15
-14
lines changed
  • tests/phys_rep_perf.test

1 file changed

+15
-14
lines changed

tests/phys_rep_perf.test/runit

+15-14
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ source ${TESTSROOTDIR}/tools/cluster_utils.sh
88

99
export comdb2ar=${COMDB2AR_EXE}
1010
export FIGLET=$(which figlet)
11-
export META_DBNAME=metadb
12-
export PHYSREP=physrep
11+
export META_DBNAME=metadb${TESTID}
12+
export PHYSREP=physrep${TESTID}
1313
export PIDLIST=""
1414
export FIRSTNODE=""
1515
export FIGLET=$(which figlet)
@@ -52,12 +52,12 @@ function cleanup_internal()
5252

5353
if [[ -n "$CLUSTER" ]]; then
5454
for node in $CLUSTER; do
55-
pid=$(ssh $node "cat ${METADIR}/${META_DBNAME}.pid" < /dev/null)
56-
ssh $node "kill -$sig $$pid" < /dev/null
55+
pid=$(ssh -n -o StrictHostKeyChecking=no -tt $node "cat ${METADIR}/${META_DBNAME}.pid" < /dev/null)
56+
ssh -n -o StrictHostKeyChecking=no -tt $node "kill -$sig $$pid" < /dev/null
5757
done
5858

59-
pid=$(ssh $FIRSTNODE "cat ${DBDIR}/${PHYSREP}/${PHYSREP}.pid" < /dev/null)
60-
ssh $FIRSTNODE "kill -$sig $$pid" < /dev/null
59+
pid=$(ssh -n -o StrictHostKeyChecking=no -tt $FIRSTNODE "cat ${DBDIR}/${PHYSREP}/${PHYSREP}.pid" < /dev/null)
60+
ssh -n -o StrictHostKeyChecking=no -tt $FIRSTNODE "kill -$sig $$pid" < /dev/null
6161
else
6262
node=$(hostname)
6363
kill -$sig $(cat ${METADIR}/${META_DBNAME}.pid)
@@ -255,8 +255,8 @@ function fix_lrl_and_restart_source_nodes
255255

256256
else
257257
for node in $CLUSTER; do
258-
ssh ${node} "echo physrep_metadb ${META_DBNAME} $FIRSTNODE >> ${DBDIR}/${DBNAME}.lrl" < /dev/null
259-
ssh ${node} "echo physrep_debug 1 >> ${DBDIR}/${DBNAME}.lrl" < /dev/null
258+
ssh -n -o StrictHostKeyChecking=no -tt ${node} "echo physrep_metadb ${META_DBNAME} $FIRSTNODE >> ${DBDIR}/${DBNAME}.lrl" < /dev/null
259+
ssh -n -o StrictHostKeyChecking=no -tt ${node} "echo physrep_debug 1 >> ${DBDIR}/${DBNAME}.lrl" < /dev/null
260260
echo "physrep_metadb ${META_DBNAME} $FIRSTNODE" >> ${DBDIR}/${DBNAME}.lrl
261261
echo "physrep_debug 1" >> ${DBDIR}/${DBNAME}.lrl
262262
kill_restart_node $node 10 &
@@ -309,7 +309,7 @@ END
309309
FIRSTNODE=""
310310
for node in $CLUSTER; do
311311
logfile=$TESTDIR/logs/${META_DBNAME}.${node}.log
312-
ssh ${node} "mkdir -p $METADIR" < /dev/null
312+
ssh -n -o StrictHostKeyChecking=no -tt ${node} "mkdir -p $METADIR" < /dev/null
313313

314314
if [[ -z "$FIRSTNODE" ]]; then
315315
FIRSTNODE=$node
@@ -331,18 +331,19 @@ physrep_update_registry_interval 1
331331
physrep_keepalive_v2 1
332332
END
333333
scp $METADIR/${META_DBNAME}.lrl ${node}:$METADIR/${META_DBNAME}.lrl
334-
ssh ${node} "$COMDB2_EXE ${META_DBNAME} --create --lrl ${METADIR}/${META_DBNAME}.lrl --pidfile ${METADIR}/${META_DBNAME}.pid >> $logfile 2>&1" < /dev/null
334+
ssh -n -o StrictHostKeyChecking=no -tt ${node} "$COMDB2_EXE ${META_DBNAME} --create --lrl ${METADIR}/${META_DBNAME}.lrl --pidfile ${METADIR}/${META_DBNAME}.pid >> $logfile 2>&1" < /dev/null
335335
else
336-
ssh $node "${COPYCOMDB2_EXE} -x ${COMDB2_EXE} $FIRSTNODE:${METADIR}/${META_DBNAME}.lrl $METADIR/" >> $logfile 2>&1 < /dev/null
336+
ssh -n -o StrictHostKeyChecking=no -tt $node "${COPYCOMDB2_EXE} -x ${COMDB2_EXE} $FIRSTNODE:${METADIR}/${META_DBNAME}.lrl $METADIR $METADIR" >> $logfile 2>&1 < /dev/null
337337
if [[ ! $? -eq 0 ]]; then
338+
cat $logfile
338339
cleanfailexit "copycomdb2 failed for $node"
339340
fi
340341
fi
341342
done
342343

343344
for node in $CLUSTER; do
344345
logfile=$TESTDIR/logs/${META_DBNAME}.${node}.log
345-
ssh ${node} "$COMDB2_EXE ${META_DBNAME} --lrl ${METADIR}/${META_DBNAME}.lrl --pidfile ${METADIR}/${META_DBNAME}.pid" >> $logfile 2>&1 < /dev/null &
346+
ssh -n -o StrictHostKeyChecking=no -tt ${node} "$COMDB2_EXE ${META_DBNAME} --lrl ${METADIR}/${META_DBNAME}.lrl --pidfile ${METADIR}/${META_DBNAME}.pid" >> $logfile 2>&1 < /dev/null &
346347
PIDLIST="${PIDLIST} $!"
347348
done
348349

@@ -379,12 +380,12 @@ function setup_standalone_physrep()
379380
else
380381
node=$FIRSTNODE
381382
logfile=$TESTDIR/logs/${PHYSREP}.$FIRSTNODE.log
382-
ssh ${node} "${COPYCOMDB2_EXE} -x ${COMDB2_EXE} -H ${PHYSREP} -y @${FIRSTNODE} ${FIRSTNODE}:${DBDIR}/${DBNAME}.lrl $PHYSDIR $PHYSDIR" >> $logfile 2>&1 < /dev/null
383+
ssh -n -o StrictHostKeyChecking=no -tt ${node} "${COPYCOMDB2_EXE} -x ${COMDB2_EXE} -H ${PHYSREP} -y @${FIRSTNODE} ${FIRSTNODE}:${DBDIR}/${DBNAME}.lrl $PHYSDIR $PHYSDIR" >> $logfile 2>&1 < /dev/null
383384
if [[ $? -ne 0 ]]; then
384385
cleanfailexit "failed creating physrep for $node"
385386
fi
386387

387-
ssh ${node} "$COMDB2_EXE ${PHYSREP} --lrl $PHYSDIR/${PHYSREP}.lrl --pidfile $PHYSDIR/${PHYSREP}.pid" >> $logfile 2>&1 < /dev/null &
388+
ssh -n -o StrictHostKeyChecking=no -tt ${node} "$COMDB2_EXE ${PHYSREP} --lrl $PHYSDIR/${PHYSREP}.lrl --pidfile $PHYSDIR/${PHYSREP}.pid" >> $logfile 2>&1 < /dev/null &
388389
PIDLIST="${PIDLIST} $!"
389390
out=""
390391
while [[ "$out" != "1" ]]; do

0 commit comments

Comments
 (0)