Merge branch 'develop' of https://github.com/opensciencegrid/StashCache

Author: djw8605

bin/stashcp

@@ -27,7 +27,7 @@ def doStashCpSingle(sourceFile, destination, cache, debug=False):
     xrdfs = subprocess.Popen(["xrdfs", "root://stash.osgconnect.net", "stat", sourceFile], stdout=subprocess.PIPE).communicate()[0]
     xrdcp_version = subprocess.Popen(['echo $(xrdcp -V 2>&1)'], stdout=subprocess.PIPE, shell=True).communicate()[0][:-1]
     fileSize = int(re.findall(r"Size:   \d+", xrdfs)[0].split(":   ")[1])
-    logging.debug("Size of the file %s is %i", sourceFile, str(fileSize))
+    logging.debug("Size of the file %s is %s", sourceFile, str(fileSize))
     #cache=get_best_stashcache()
     logging.debug("Using Cache %s", cache)
 
@@ -89,8 +89,8 @@ def doStashCpSingle(sourceFile, destination, cache, debug=False):
     xrd_exit=timed_transfer(filename=sourceFile, debug=debug, cache=cache, destination=destination)
 
     end2=int(time.time()*1000)
-    if os.path.exists(filename):
-        dlSz=os.stat(filename).st_size
+    if os.path.exists(destination):
+        dlSz=os.stat(destination).st_size
     destSpace=1
 
     payload['xrdexit1']=xrd_exit
@@ -118,8 +118,8 @@ def doStashCpSingle(sourceFile, destination, cache, debug=False):
         start3 = int(time.time()*1000)
         xrd_exit=timed_transfer(filename=sourceFile, debug=debug, cache=cache, destination=destination)
         end3=int(time.time()*1000)
-        if os.path.exists(filename):
-            dlSz=os.stat(filename).st_size
+        if os.path.exists(destination):
+            dlSz=os.stat(destination).st_size
         dltime=end3-start3
         if xrd_exit=='0':
             logging.info("Trunk Success")
@@ -242,7 +242,7 @@ def get_best_stashcache():
     geo_ip_sites = "http://cvmfs-s1fnal.opensciencegrid.org:8000/cvmfs/oasis.opensciencegrid.org;http://cvmfs-s1bnl.opensciencegrid.org:8000/cvmfs/oasis.opensciencegrid.org;http://cvmfs-egi.gridpp.rl.ac.uk:8000/cvmfs/oasis.opensciencegrid.org;http://klei.nikhef.nl:8000/cvmfs/oasis.opensciencegrid.org;http://cvmfsrep.grid.sinica.edu.tw:8000/cvmfs/oasis.opensciencegrid.org".split(';')
 
     # Add HCC's, for good measure
-    geo_ip_sites.insert(0,"hcc-cvmfs.unl.edu:8000/cvmfs/config-osg.opensciencegrid.org")
+    geo_ip_sites.insert(0,"http://hcc-cvmfs.unl.edu:8000/cvmfs/config-osg.opensciencegrid.org")
 
     # Append text before caches string
     append_text = "api/v1.0/geo/@proxy@"

bin/stashcp2/tests/test_inside_docker.sh

@@ -42,11 +42,18 @@ pylint /StashCache/bin/stashcp || /bin/true
 
 result=`md5sum query1 | awk '{print $1;}'`
 
+rm query1
+
+# Try copying with different destintion filename
+/StashCache/bin/stashcp --cache=$XRD_CACHE -d /user/dweitzel/public/blast/queries/query1 query.test
+
+result=`md5sum query.test | awk '{print $1;}'`
+
 if [ "$result" != "12bdb9a96cd5e8ca469b727a81593201" ]; then
   exit 1
 fi
 
-rm query1
+rm -f query.test
 
 # Perform tests
 /StashCache/bin/stashcp --cache=$XRD_CACHE -d /user/dweitzel/public/blast/queries/query1 ./