Commit 4b747bc3 authored by Julien Leduc's avatar Julien Leduc
Browse files

cta-taped config is now in /etc/cta/cta-taped.conf and the logs are collected...

cta-taped config is now in /etc/cta/cta-taped.conf and the logs are collected in /var/log/cta/cta-taped.log so that we can download them as artifacts. Fixed a minor bug in run_systemtest.sh where the namespace was deleted upon test failure when -k option was set.
parent 9ac655b8
......@@ -39,9 +39,9 @@ echo ${DATABASEURL} >/etc/cta/cta_catalogue_db.conf
echo "TapeServer EOSRemoteHostAndPort ${eoshost}" >>/etc/castor/castor.conf
# cta-taped setup
echo "taped BufferCount 10" > /etc/cta/cta.conf
echo "taped MountCriteria 2000000, 5" >> /etc/cta/cta.conf
echo "general ObjectStoreURL $OBJECTSTOREURL" >> /etc/cta/cta.conf
echo "taped BufferCount 10" > /etc/cta/cta-taped.conf
echo "taped MountCriteria 2000000, 5" >> /etc/cta/cta-taped.conf
echo "general ObjectStoreURL $OBJECTSTOREURL" >> /etc/cta/cta-taped.conf
echo "${tpconfig}" > /etc/cta/TPCONFIG
......@@ -56,7 +56,7 @@ chmod 600 /etc/cta/${CTATAPEDSSS}
chown cta /etc/cta/${CTATAPEDSSS}
cat <<EOF > /etc/sysconfig/cta-taped
export CTA_TAPED_OPTIONS="-fl /cta-taped.log"
export CTA_TAPED_OPTIONS="--foreground --config /etc/cta/cta-taped.conf -l /var/log/cta/cta-taped.log"
export XrdSecPROTOCOL=sss
......@@ -67,7 +67,7 @@ EOF
. /etc/sysconfig/cta-taped
tail -F /cta-taped.log &
tail -F /var/log/cta/cta-taped.log &
# cta-taped is ran with runuser to avoid a bug with Docker that prevents both
# the setresgid(-1, 1474, -1) and setresuid(-1, 14029, -1) system calls from
......
......@@ -84,7 +84,9 @@ function execute_log {
if [ "${execute_log_rc}" != "0" ]; then
echo "FAILURE: cleaning up environment"
cd ${orchestration_dir}
./delete_instance.sh -n ${namespace}
if [ $keepnamespace == 0 ] ; then
./delete_instance.sh -n ${namespace}
fi
exit 1
fi
}
......
Supports Markdown
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