Changeset 18671 for trunk/DataCheck

Timestamp:

11/02/16 03:33:54 (8 years ago)

Author:

Daniela Dorner

Message:

changed back to not using the rsync server which was gone after the upgrade of the machines

File:

• trunk/DataCheck/Transfer/RsyncAuxLP.sh (modified) (2 diffs)

trunk/DataCheck/Transfer/RsyncAuxLP.sh

@@ -71 +71 @@
    rsyncserverdir=`echo $dir | sed -e 's/^\//172.16.100.100::/' -e 's/loc_data/newdaq/'` 
    # old
-   #if ! /usr/bin/rsync -avxHP -T $rsynctempdir $bwlimit newdaq:$dir/ $dir >> $logfile 2>&1
+   if ! /usr/bin/rsync -avxHP -T $rsynctempdir $bwlimit newdaq:$dir/ $dir >> $logfile 2>&1
    # new (temporary until pb on daq is solved)
-   if ! /usr/bin/rsync -avxHP -T $rsynctempdir $bwlimit $rsyncserverdir/ $dir >> $logfile 2>&1
+   #if ! /usr/bin/rsync -avxHP -T $rsynctempdir $bwlimit $rsyncserverdir/ $dir >> $logfile 2>&1
    then
       printprocesslog "CONNECTION problem rsyncing auxiliary files in "$dir" from newdaq to daq"
@@ -81 +81 @@
    # rsynctemp-dir -> use one on data!!! i.e. has to be /data/rsync_tmp
    # rsync from daq to data
-   # old (rsynctempdirdata not tested)
-   #rsynctempdirdata=`echo $rsynctempdir | sed -e 's/loc_//'` 
-   #if ! /usr/bin/rsync -avxHP -T $rsynctempdirdata $bwlimit $dir/ $dirdata >> $logfile 2>&1
-   # new
-   rsyncserverdirdata=`echo $dir | sed -e 's/^\//data::/' -e 's/loc_//'` 
-   rsynctempdirdata=/rsync_tmp
-   if ! /usr/bin/rsync -avxHP -T $rsynctempdirdata $bwlimit $dir/ $rsyncserverdirdata >> $logfile 2>&1
+   rsynctempdirdata=/data/rsync_tmp
+   if ! /usr/bin/rsync -avxHP -T $rsynctempdirdata $bwlimit $dir/ $dirdata >> $logfile 2>&1
    then
       printprocesslog "CONNECTION problem rsyncing auxiliary files in "$dir" from daq to data"