Changeset 18434 for trunk/DataCheck

Timestamp:

02/13/16 17:46:02 (9 years ago)

Author:

Daniela Dorner

Message:

improved logging, additional check for DB (jobs that were reset while still runnning)

File:

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

trunk/DataCheck/Transfer/CheckTransfer.sh

@@ -74 +74 @@
 toquery="CONCAT(fNight, '_', fRunID, ':', fReturnCode) "
 toquery="IF (ISNULL(fReturnCode), CONCAT(fNight, '_', fRunID, 'crashed'), CONCAT(fNight, '_', fRunID, 'failed', fReturnCode)) "
-where="WHERE NOT ISNULL(fReturnCode) OR (NOT ISNULL(fStartTime) AND ISNULL(fStopTime)) AND fStartTime < DATE_ADD(Now(), INTERVAL -5 HOUR) "
+where="WHERE NOT ISNULL(fReturnCode) OR (NOT ISNULL(fStartTime) AND ISNULL(fStopTime) AND fStartTime < DATE_ADD(Now(), INTERVAL -5 HOUR)) OR (ISNULL(fStartTime) AND NOT ISNULL(fStopTime)) "
 check_runs_in_db "RawFileRsyncedISDCStatus"
 check_runs_in_db "RawFileAvailWueStatus"
 # RawFileAvailISDC needs a different treatment 
 #  as return code 0 means that file is in fails folder in archive
-where="WHERE fReturnCode>0 OR (NOT ISNULL(fStartTime) AND ISNULL(fStopTime)) AND fStartTime < DATE_ADD(Now(), INTERVAL -1 HOUR) "
+where="WHERE fReturnCode>0 OR (NOT ISNULL(fStartTime) AND ISNULL(fStopTime) AND fStartTime < DATE_ADD(Now(), INTERVAL -1 HOUR)) OR (ISNULL(fStartTime) AND NOT ISNULL(fStopTime)) "
 check_runs_in_db "RawFileAvailISDCStatus"
 
@@ -228 +228 @@
    #printprocesslog "  phido   "$numphido
    printprocesslog "  data    "$numdatruns
+   echo "" >> $logfile 2>&1
+   echo "" >> $logfile 2>&1
+   echo "" >> $logfile 2>&1
+   echo `date`": checking the transfer..." >> $logfile 2>&1
+   echo "" >> $logfile 2>&1
    echo "disk: " >> $logfile 2>&1
    echo "  newdaq  "${newdaq[@]} >> $logfile 2>&1