Changeset 18852

Timestamp:

05/14/17 20:57:08 (8 years ago)

Author:

Daniela Dorner

Message:

updated to use newdata instead of data for transferring data

Location:

trunk/DataCheck/Transfer

Files:

• RsyncAuxToISDC.sh (modified) (2 diffs)
• RsyncRawToISDC.sh (modified) (7 diffs)

trunk/DataCheck/Transfer/RsyncAuxToISDC.sh

@@ -26 +26 @@
    echo $date >> $logfile 2>&1
    # auxiliary data directories
-   auxdirlp=/loc_data/aux/./$date/ 
+   auxdirlp=/data2/aux/./$date/ 
    auxdirisdc=/scratch/from_lapalma/aux
    
@@ -60 +60 @@
    #rsync from daq to data
    #if ! /usr/bin/rsync -avxHPu $bwlimit $auxdirdaq $auxdirdata >> $logfile 2>&1 # in case of adding checksum, only update files with rsync
-   if ! rsync -rltDvR -T $rsynctempdir --stats fact@161.72.93.131:$auxdirlp $auxdirisdc >> $logfile 2>&1
+   if ! rsync -rltDvR -T $rsynctempdir --stats fact@161.72.93.138:$auxdirlp $auxdirisdc >> $logfile 2>&1
    then
       printprocesslog "CONNECTION problem rsyncing auxiliary data for "$date" from La Palma to ISDC"

trunk/DataCheck/Transfer/RsyncRawToISDC.sh

@@ -49 +49 @@
    runid=${primaries[$s+$s+1]}
    nightpath=`echo $night | cut -c 1-4`"/"`echo $night | cut -c 5-6`"/"`echo $night | cut -c 7-8`
-   lppath="/loc_data/zipraw/"$nightpath
+   lppath="/data2/zipraw/"$nightpath
    nightrun=$night"_"`printf %03d $runid`
 
@@ -65 +65 @@
    fi
 
-   lpfile=`ssh fact@161.72.93.131 "find $lppath -type f -regex '.*$nightrun[.]fits[.][fg]z'"`
+   lpfile=`ssh fact@161.72.93.138 "find $lppath -type f -regex '.*$nightrun[.]fits[.][fg]z'"`
    if [ "$lpfile" == "" ]
    then
-      #echo $nightrun" not yet available on data."
+      echo $nightrun" not yet available on data."
       printprocesslog "INFO "$nightrun" not yet available on data."
       continue
@@ -77 +77 @@
    setstatus "start" 
 
-   rawfilelp="/loc_data/zipraw/./"$nightpath"/"$filename
+   rawfilelp="/data2/zipraw/./"$nightpath"/"$filename
    rawdirisdc="/scratch/from_lapalma/raw/"
    rawfileisdc=$rawdirisdc$nightpath"/"$filename
@@ -84 +84 @@
    ingestlink=$ingestlinkpath"/"$filename
 
-   if ! ssh fact@161.72.93.131 "ls $rawfilelp >/dev/null 2>&1"
+   if ! ssh fact@161.72.93.138 "ls $rawfilelp >/dev/null 2>&1"
    then
       #echo $rawfilelp" not yet available on data."
@@ -100 +100 @@
    printprocesslog "INFO rsync rawfile "$rawfilelp" to ISDC "$rawdirisdc
    #echo "INFO rsync rawfile "$rawfilelp" to ISDC "$rawdirisdc >> $logfile 2>&1
-   #rsync -rltDvR --partial --stats --password-file=$rsyncpwfile factdata@161.72.93.131::$rawfilelp $rawdirisdc >> $logfile 2>&1
-   #echo "rsync -rltDvR -T $rsynctempdir --partial --stats fact@161.72.93.131:$rawfilelp $rawdirisdc >> $logfile 2>&1"
-   rsync -rltDvR -T $rsynctempdir --partial --stats fact@161.72.93.131:$rawfilelp $rawdirisdc >> $logfile 2>&1
+   #rsync -rltDvR --partial --stats --password-file=$rsyncpwfile factdata@161.72.93.138::$rawfilelp $rawdirisdc >> $logfile 2>&1
+   #echo "rsync -rltDvR -T $rsynctempdir --partial --stats fact@161.72.93.138:$rawfilelp $rawdirisdc >> $logfile 2>&1"
+   rsync -rltDvR -T $rsynctempdir --partial --stats fact@161.72.93.138:$rawfilelp $rawdirisdc >> $logfile 2>&1
    check1=$?
 
@@ -132 +132 @@
    if [ $numdrs -gt 0 ]
    then 
-      drsfilelp="/loc_data/zipraw/./"$nightpath"/"$nightrun".drs.fits.gz"
+      drsfilelp="/data2/zipraw/./"$nightpath"/"$nightrun".drs.fits.gz"
       drsfileisdc=$rawdirisdc$nightpath"/"$nightrun".drs.fits.gz"
       drsingestlink=$ingestlinkpath"/"$nightrun".drs.fits.gz"
 
-      if ! ssh fact@161.72.93.131 "ls $drsfilelp >/dev/null 2>&1"
+      if ! ssh fact@161.72.93.138 "ls $drsfilelp >/dev/null 2>&1"
       then
          #echo $drsfilelp" not yet available on data."
@@ -148 +148 @@
       printprocesslog "INFO rsync drsfile "$drsfilelp" to ISDC "$rawdirisdc
       echo "INFO rsync drsfile "$drsfilelp" to ISDC "$rawdirisdc >> $logfile 2>&1
-      #rsync -rltDvR --partial --stats --password-file=$rsyncpwfile factdata@161.72.93.131::$rawfilelp $rawdirisdc >> $logfile 2>&1
-      rsync -rltDvR -T $rsynctempdir --partial --stats fact@161.72.93.131:$drsfilelp $rawdirisdc >> $logfile 2>&1
+      #rsync -rltDvR --partial --stats --password-file=$rsyncpwfile factdata@161.72.93.138::$rawfilelp $rawdirisdc >> $logfile 2>&1
+      rsync -rltDvR -T $rsynctempdir --partial --stats fact@161.72.93.138:$drsfilelp $rawdirisdc >> $logfile 2>&1
       check3=$?