Merge pull request cms-sw#4399 from smorovic/EvF-fixes-7_2_X

EvF lumiblock consistency cross-check
cbernet · Jun 27, 2014 · ff54496 · ff54496
2 parents 13caed1 + aac14fd
commit ff54496
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/EventFilter/Utilities/plugins/FedRawDataInputSource.cc b/EventFilter/Utilities/plugins/FedRawDataInputSource.cc
@@ -826,6 +826,11 @@ void FedRawDataInputSource::readSupervisor()
 	fileQueue_.push(new InputFile(evf::EvFDaqDirector::newLumi, currentLumiSection));
       }
 
+      if( getLSFromFilename_ && currentLumiSection>0 && ls < currentLumiSection) {
+          edm::LogError("FedRawDataInputSource") << "Got old LS ("<<ls<<") file from EvFDAQDirector! Expected LS:" << currentLumiSection<<". Aborting execution."<<std::endl;
+          _exit(-1);
+      }
+
       int dbgcount=0;
       if (status == evf::EvFDaqDirector::noFile) {
 	dbgcount++;

diff --git a/EventFilter/Utilities/src/EvFDaqDirector.cc b/EventFilter/Utilities/src/EvFDaqDirector.cc
@@ -404,8 +404,10 @@ namespace evf {
 	if (testModeNoBuilderUnit_)
 	  fscanf(fu_rw_lock_stream, "%u %u %u %u", &readLs, &readIndex,
 		 &jumpLs, &jumpIndex);
-	else
+	else {
 	  fscanf(fu_rw_lock_stream, "%u %u", &readLs, &readIndex);
+	  edm::LogInfo("EvFDaqDirector") << "Read fu.lock file file -: " << readLs << ":" << readIndex;
+        }
 
 	// try to bump
 	bool bumpedOk = bumpFile(readLs, readIndex, nextFile, fsize);
@@ -517,16 +519,14 @@ namespace evf {
       bool eolFound = (stat(getEoLSFilePathOnBU(ls).c_str(), &buf) == 0);
       unsigned int startingLumi = ls;
       while (eolFound) {
-        //DEBUG!
-        //remove this for testing (might not be necessary after all..)
-        /*
+
         // recheck that no raw file appeared in the meantime
         if (stat(nextFile.c_str(), &buf) == 0) {
           previousFileSize_ = buf.st_size;
           fsize = buf.st_size;
           return true;
         }
-        */
+
 	// this lumi ended, check for files
 	++ls;
 	nextFile = getInputJsonFilePath(ls,0);