From 99c195932a56c99cda517d657a52407643d39011 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Thu, 16 May 2019 17:42:59 +0200
Subject: [PATCH] Revert "client_ar.sh now calls 'eos rm' in parallel"
This reverts commit 14cc088c8bd5f35739e5200514502d75ce02bd6b.
---
.../orchestration/tests/client_ar.sh | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/continuousintegration/orchestration/tests/client_ar.sh b/continuousintegration/orchestration/tests/client_ar.sh
index a116aa02e5..5cb4c82bad 100644
--- a/continuousintegration/orchestration/tests/client_ar.sh
+++ b/continuousintegration/orchestration/tests/client_ar.sh
@@ -396,11 +396,16 @@ if [[ $REMOVE == 1 ]]; then
# recount the files on tape as the workflows may have gone further...
INITIALFILESONTAPE=$(admin_cta archivefile ls --all | grep ${EOS_DIR} | wc -l)
echo "Before starting deletion there are ${INITIALFILESONTAPE} files on tape."
-
- for TEST_FILE_NAME in $(grep archived$ ${STATUS_FILE} | sed -e 's/ .*$//'); do
- echo ${TEST_FILE_NAME}
- done | KRB5CCNAME=/tmp/${EOSPOWER_USER}/krb5cc_0 XrdSecPROTOCOL=krb5 xargs --max-procs=${NB_PROCS} -iTEST_FILE_NAME eos root://${EOSINSTANCE} rm ${EOS_DIR}/TEST_FILE_NAME
-
+ #XrdSecPROTOCOL=sss eos -r 0 0 root://${EOSINSTANCE} rm -Fr ${EOS_DIR} &
+ KRB5CCNAME=/tmp/${EOSPOWER_USER}/krb5cc_0 XrdSecPROTOCOL=krb5 eos root://${EOSINSTANCE} rm -Fr ${EOS_DIR} &
+ EOSRMPID=$!
+ # wait a bit in case eos prematurely fails...
+ sleep 0.1
+ if test ! -d /proc/${EOSRMPID}; then
+ # eos rm process died, get its status
+ wait ${EOSRMPID}
+ test $? -ne 0 && die "Could not launch eos rm"
+ fi
# Now we can start to do something...
# deleted files are the ones that made it on tape minus the ones that are still on tapes...
echo "Waiting for files to be deleted:"
--
GitLab