Skip to content

endeavour: clean up scripts #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamesanunez wants to merge 1 commit into
base: master
Choose a base branch
from
Open

endeavour: clean up scripts #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions edv/test_scripts/client/scripts/client_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ export PATH=/usr/local/ofed/CURRENT/bin:$PATH
export LD_LIBRARY_PATH=/usr/local/ofed/CURRENT/lib64:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=/usr/local/ofed/CURRENT/lib64/libibverbs:$LD_LIBRARY_PATH

# Use crt's fuse libraries since CentOS8 has a very old version
export PATH=/opt/crtdc/fuse3/bin:$PATH
export LD_LIBRARY_PATH=/opt/crtdc/fuse3/lib64:$LD_LIBRARY_PATH

daospath=/$DAOS_INSTALL
prereqpath=/$DAOS_INSTALL/prereq/release

Expand Down Expand Up @@ -72,6 +68,6 @@ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/

export CPATH=${daospath}/include/:$CPATH

# FUSE3
# FUSE3 - Use crt's fuse libraries since CentOS8 has an old version
export PATH=/opt/crtdc/fuse3/bin:$PATH
export LD_LIBRARY_PATH=/opt/crtdc/fuse3/lib64:$LD_LIBRARY_PATH
8 changes: 3 additions & 5 deletions edv/test_scripts/client/scripts/run_client.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ if [[ $? -ne 0 ]]; then
exit 1
fi

ls -al /panfs/users/rpadma2/apps/${MPI}/lammps

echo "Sourcing env"
if [[ "$TEST" =~ "EFISPEC" ]]; then
. /opt/intel/oneAPI/latest/setvars.sh
Expand Down Expand Up @@ -69,12 +67,12 @@ which daos_agent
echo

echo "Cleaning Agent"
clush --hostfile=${CLI_HOSTLIST} "export TB=$TB; export RUNDIR=${RUNDIR}; cd ${RUNDIR}/scripts; source client_env.sh; ./clean_agent.sh"
clush --hostfile=${CLI_HOSTLIST} "export TB=$TB; export RUNDIR=${RUNDIR}; cd ${RUNDIR}/scripts; ./clean_agent.sh"
sleep 5
echo

echo "Starting Agent"
clush --hostfile=${CLI_HOSTLIST} "export TB=$TB; export RUNDIR=${RUNDIR}; cd ${RUNDIR}/scripts; source client_env.sh; ./start_agent.sh" &
clush --hostfile=${CLI_HOSTLIST} "export TB=$TB; export RUNDIR=${RUNDIR}; cd ${RUNDIR}/scripts; ./start_agent.sh" &
sleep 5
echo

Expand Down Expand Up @@ -134,7 +132,7 @@ fi

if [ "$MOUNT_DFUSE" == "1" ]; then
echo "Mounting Dfuse"
clush --hostfile=${CLI_HOSTLIST} "export TB=${TB}; export RUNDIR=${RUNDIR}; export PLABEL=${PLABEL}; export CLABEL=${CLABEL}; export MOUNTDIR=${MOUNTDIR}; export DFUSECACHE=${DFUSECACHE}; ${RUNDIR}/scripts/mount_dfuse.sh"
clush --hostfile=${CLI_HOSTLIST} "export RUNDIR=${RUNDIR}; export PLABEL=${PLABEL}; export CLABEL=${CLABEL}; export MOUNTDIR=${MOUNTDIR}; export DFUSECACHE=${DFUSECACHE}; ${RUNDIR}/scripts/mount_dfuse.sh"

if [[ ! -d ${MOUNTDIR} ]]; then
echo Dfuse mount unsuccessful!!
Expand Down
2 changes: 0 additions & 2 deletions edv/test_scripts/client/scripts/start_agent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@ mkdir -p ${DAOS_AGENT_DRPC_DIR}
rm -f daos_server.attach_info_tmp
export HWLOC_HIDE_ERRORS=1
daos_agent -o ${RUNDIR}/scripts/daos_agent-${USER}.yml &
rm -rf /tmp/daos_m/$USER
mkdir -p /tmp/daos_m/$USER