add port as variable and fix paths

python/s3daemon/s3daemon.py

@@ -36,7 +36,7 @@
     ),
 )
 
-PORT = 15555
+PORT = int(os.environ["S3DAEMON_PORT"])
 endpoint_url = os.environ["S3_ENDPOINT_URL"]
 access_key = os.environ["AWS_ACCESS_KEY_ID"]
 secret_key = os.environ["AWS_SECRET_ACCESS_KEY"]

python/s3daemon/send.py

@@ -21,8 +21,9 @@
 
 import socket
 import sys
+import os
 
-PORT = 15555
+PORT = int(os.environ["S3DAEMON_PORT"])
 
 
 def send(filename, dest):

summittests/envvars-template.sh

@@ -7,5 +7,6 @@ export AWS_SECRET_ACCESS_KEY=""
 export bucket="rubin-summit-users"
 export prefix="test-lhn"
 export nodes="lsstcam-dc03 lsstcam-dc04 lsstcam-dc05 lsstcam-dc06 lsstcam-dc07 lsstcam-dc08 lsstcam-dc09 lsstcam-dc10"
-export datadir="~tonyj/Test/"
+export datadir="/home/tonyj/Test/"
+export S3DAEMON_PORT="15555"
 

summittests/runOnNodes.sh

@@ -8,7 +8,7 @@ source  envvars.sh
 cmd="$@"
 
 for n in $nodes; do 
-   exec="cd s3daemon/summittests; ${cmd}" 
+   exec="cd ~/s3daemon/summittests; ${cmd}" 
    echo $exec
    ssh $n "${exec}" &
    done

summittests/sendTest.sh

@@ -8,27 +8,26 @@ source venv/bin/activate
 
 
 
-total=2
+repeat=2
 if [ $1 ] 
 then
-  total="$1"
+  repeat="$1"
 fi
-echo "$HOSTNAME S3_ENDPOINT_URL is $S3_ENDPOINT_URL  total $total $datadir"
+echo "$HOSTNAME S3_ENDPOINT_URL is $S3_ENDPOINT_URL  repeat $repeat $datadir"
 
 files=`ls  ${datadir}/MC*/* `
 
 fcount=0
+l=0
 
-while [[ fcount -le total ]] 
+while [[ l -le repeat ]] 
 do
+echo Repetition number $l out of $repeat on $HOSTNAME
+l=$((l + 1))
 for f in $files; do 
    key=`echo $f | cut -d'/' -f6`
    python ../python/s3daemon/send.py $f /${bucket}/${prefix}/${key} & 
    fcount=$((fcount + 1))
-   if [[ fcount -ge total ]]
-   then
-       break
-   fi
    if [ $((fcount % 20)) ==  0 ]
    then
        echo Sent $key total $fcount
@@ -37,4 +36,4 @@ for f in $files; do
    fi 
 done
 done
-echo Sent  total $fcount
+echo Sent total $fcount from $HOSTNAME to $S3_ENDPOINT_URL