Commit 8892c6c0 authored by David Cameron's avatar David Cameron

update variable name to match conf option

parent 1f4c0ac6
......@@ -113,7 +113,7 @@ init_lrms_env () {
RUNTIME_FRONTEND_SEES_NODE=$CONFIG_shared_scratch
RUNTIME_NODE_SEES_FRONTEND=$CONFIG_shared_filesystem
RUNTIME_LOCAL_SCRATCH_DIR=$CONFIG_scratchdir
RUNTIME_LOCAL_SCRATCH_COPY_TOOL=${CONFIG_movetool:-mv}
RUNTIME_LOCAL_SCRATCH_MOVE_TOOL=${CONFIG_movetool:-mv}
#default is NFS
if [ -z "${RUNTIME_NODE_SEES_FRONTEND}" ] ; then
......
......@@ -78,7 +78,7 @@ if [ ! -z "$RUNTIME_GRIDAREA_DIR" ] ; then
RUNTIME_CONTROL_DIR=`echo "$RUNTIME_CONTROL_DIR" | sed "s#^$RUNTIME_JOB_DIR#$RUNTIME_GRIDAREA_DIR#"`
fi
RUNTIME_LOCAL_SCRATCH_DIR=${RUNTIME_LOCAL_SCRATCH_DIR:-}
RUNTIME_LOCAL_SCRATCH_COPY_TOOL=${RUNTIME_LOCAL_SCRATCH_COPY_TOOL:-mv}
RUNTIME_LOCAL_SCRATCH_MOVE_TOOL=${RUNTIME_LOCAL_SCRATCH_MOVE_TOOL:-mv}
RUNTIME_FRONTEND_SEES_NODE=${RUNTIME_FRONTEND_SEES_NODE:-}
RUNTIME_NODE_SEES_FRONTEND=${RUNTIME_NODE_SEES_FRONTEND:-yes}
if [ ! -z "$RUNTIME_LOCAL_SCRATCH_DIR" ] && [ ! -z "$RUNTIME_NODE_SEES_FRONTEND" ]; then
......@@ -92,8 +92,8 @@ RUNTIME_NODE_SEES_FRONTEND=${RUNTIME_NODE_SEES_FRONTEND:-yes}
[ "$f" = "$RUNTIME_JOB_DIR/.." ] && continue
[ "$f" = "$RUNTIME_JOB_DIR/.diag" ] && continue
[ "$f" = "$RUNTIME_JOB_DIR/.comment" ] && continue
if ! $RUNTIME_LOCAL_SCRATCH_COPY_TOOL "$f" "$RUNTIME_NODE_JOB_DIR"; then
echo "Failed to '$RUNTIME_LOCAL_SCRATCH_COPY_TOOL' '$f' to '$RUNTIME_NODE_JOB_DIR'" 1>&2
if ! $RUNTIME_LOCAL_SCRATCH_MOVE_TOOL "$f" "$RUNTIME_NODE_JOB_DIR"; then
echo "Failed to '$RUNTIME_LOCAL_SCRATCH_MOVE_TOOL' '$f' to '$RUNTIME_NODE_JOB_DIR'" 1>&2
exit 1
fi
done
......
......@@ -33,7 +33,7 @@
+RUNTIME_JOB_STDOUT="/dev/null"
+RUNTIME_JOB_STDERR="/dev/null"
+RUNTIME_LOCAL_SCRATCH_DIR=${RUNTIME_LOCAL_SCRATCH_DIR:-/local/scratch}
RUNTIME_LOCAL_SCRATCH_COPY_TOOL=${RUNTIME_LOCAL_SCRATCH_COPY_TOOL:-mv}
RUNTIME_LOCAL_SCRATCH_MOVE_TOOL=${RUNTIME_LOCAL_SCRATCH_MOVE_TOOL:-mv}
RUNTIME_FRONTEND_SEES_NODE=${RUNTIME_FRONTEND_SEES_NODE:-}
-RUNTIME_NODE_SEES_FRONTEND=${RUNTIME_NODE_SEES_FRONTEND:-yes}
+RUNTIME_NODE_SEES_FRONTEND=${RUNTIME_NODE_SEES_FRONTEND:-}
......
......@@ -24,7 +24,7 @@
+RUNTIME_JOB_STDOUT="/dev/null"
+RUNTIME_JOB_STDERR="/dev/null"
+RUNTIME_LOCAL_SCRATCH_DIR=${RUNTIME_LOCAL_SCRATCH_DIR:-/local/scratch}
RUNTIME_LOCAL_SCRATCH_COPY_TOOL=${RUNTIME_LOCAL_SCRATCH_COPY_TOOL:-mv}
RUNTIME_LOCAL_SCRATCH_MOVE_TOOL=${RUNTIME_LOCAL_SCRATCH_MOVE_TOOL:-mv}
RUNTIME_FRONTEND_SEES_NODE=${RUNTIME_FRONTEND_SEES_NODE:-}
-RUNTIME_NODE_SEES_FRONTEND=${RUNTIME_NODE_SEES_FRONTEND:-yes}
+RUNTIME_NODE_SEES_FRONTEND=${RUNTIME_NODE_SEES_FRONTEND:-}
......
......@@ -24,7 +24,7 @@
+RUNTIME_JOB_STDOUT="/local/scratch/@TEST_JOB_ID@/out"
+RUNTIME_JOB_STDERR="/local/scratch/@TEST_JOB_ID@/error"
+RUNTIME_LOCAL_SCRATCH_DIR=${RUNTIME_LOCAL_SCRATCH_DIR:-/local/scratch}
RUNTIME_LOCAL_SCRATCH_COPY_TOOL=${RUNTIME_LOCAL_SCRATCH_COPY_TOOL:-mv}
RUNTIME_LOCAL_SCRATCH_MOVE_TOOL=${RUNTIME_LOCAL_SCRATCH_MOVE_TOOL:-mv}
RUNTIME_FRONTEND_SEES_NODE=${RUNTIME_FRONTEND_SEES_NODE:-}
-RUNTIME_NODE_SEES_FRONTEND=${RUNTIME_NODE_SEES_FRONTEND:-yes}
+RUNTIME_NODE_SEES_FRONTEND=${RUNTIME_NODE_SEES_FRONTEND:-}
......
......@@ -489,7 +489,7 @@ move_files_to_node () {
else
echo "RUNTIME_LOCAL_SCRATCH_DIR=\${RUNTIME_LOCAL_SCRATCH_DIR:-}" >> $LRMS_JOB_SCRIPT
fi
echo "RUNTIME_LOCAL_SCRATCH_COPY_TOOL=\${RUNTIME_LOCAL_SCRATCH_COPY_TOOL:-$RUNTIME_LOCAL_SCRATCH_COPY_TOOL}" >> $LRMS_JOB_SCRIPT
echo "RUNTIME_LOCAL_SCRATCH_MOVE_TOOL=\${RUNTIME_LOCAL_SCRATCH_MOVE_TOOL:-$RUNTIME_LOCAL_SCRATCH_MOVE_TOOL}" >> $LRMS_JOB_SCRIPT
echo "RUNTIME_FRONTEND_SEES_NODE=\${RUNTIME_FRONTEND_SEES_NODE:-$RUNTIME_FRONTEND_SEES_NODE}" >> $LRMS_JOB_SCRIPT
echo "RUNTIME_NODE_SEES_FRONTEND=\${RUNTIME_NODE_SEES_FRONTEND:-$RUNTIME_NODE_SEES_FRONTEND}" >> $LRMS_JOB_SCRIPT
cat >> $LRMS_JOB_SCRIPT <<'EOSCR'
......@@ -504,8 +504,8 @@ move_files_to_node () {
[ "$f" = "$RUNTIME_JOB_DIR/.." ] && continue
[ "$f" = "$RUNTIME_JOB_DIR/.diag" ] && continue
[ "$f" = "$RUNTIME_JOB_DIR/.comment" ] && continue
if ! $RUNTIME_LOCAL_SCRATCH_COPY_TOOL "$f" "$RUNTIME_NODE_JOB_DIR"; then
echo "Failed to '$RUNTIME_LOCAL_SCRATCH_COPY_TOOL' '$f' to '$RUNTIME_NODE_JOB_DIR'" 1>&2
if ! $RUNTIME_LOCAL_SCRATCH_MOVE_TOOL "$f" "$RUNTIME_NODE_JOB_DIR"; then
echo "Failed to '$RUNTIME_LOCAL_SCRATCH_MOVE_TOOL' '$f' to '$RUNTIME_NODE_JOB_DIR'" 1>&2
exit 1
fi
done
......
Markdown is supported
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