Merge pull request #43850 from smorovic/mst-fix-autofs-mount

[14_0_X][DAQ] DaqDirector fixes and cleanup, and removal of EvFOutputModule
cms-sw · Feb 3, 2024 · 8086b41 · 8086b41
2 parents 11675c3 + 0a7e228
commit 8086b41
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 577 deletions.
diff --git a/EventFilter/Utilities/interface/EvFDaqDirector.h b/EventFilter/Utilities/interface/EvFDaqDirector.h
@@ -26,7 +26,6 @@
 #include <cstring>
 #include <cstdio>
 
-#include <oneapi/tbb/concurrent_hash_map.h>
 #include <boost/asio.hpp>
 
 class SystemBounds;
@@ -68,7 +67,6 @@ namespace evf {
     void initRun();
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
     void preallocate(edm::service::SystemBounds const& bounds);
-    void preBeginJob(edm::PathsAndConsumesOfModulesBase const&, edm::ProcessContext const&);
     void preBeginRun(edm::GlobalContext const& globalContext);
     void postEndRun(edm::GlobalContext const& globalContext);
     void preGlobalEndLumi(edm::GlobalContext const& globalContext);
@@ -186,10 +184,10 @@ namespace evf {
       filesToDeletePtr_ = filesToDelete;
     }
 
-    void checkTransferSystemPSet(edm::ProcessContext const& pc);
-    void checkMergeTypePSet(edm::ProcessContext const& pc);
-    std::string getStreamDestinations(std::string const& stream) const;
-    std::string getStreamMergeType(std::string const& stream, MergeType defaultType);
+    std::string getStreamDestinations(std::string const&) const { return std::string(""); }
+    std::string getStreamMergeType(std::string const&, MergeType defaultType) const {
+      return MergeTypeNames_[defaultType];
+    }
     static struct flock make_flock(short type, short whence, off_t start, off_t len, pid_t pid);
     bool inputThrottled();
     bool lumisectionDiscarded(unsigned int ls);
@@ -227,9 +225,6 @@ namespace evf {
     bool fileBrokerUseLocalLock_;
     unsigned int fuLockPollInterval_;
     bool outputAdler32Recheck_;
-    bool requireTSPSet_;
-    std::string selectedTransferMode_;
-    std::string mergeTypePset_;
     bool directorBU_;
     std::string hltSourceDirectory_;
 
@@ -284,9 +279,6 @@ namespace evf {
     std::string stopFilePathPid_;
     unsigned int stop_ls_override_ = 0;
 
-    std::shared_ptr<Json::Value> transferSystemJson_;
-    tbb::concurrent_hash_map<std::string, std::string> mergeTypeMap_;
-
     //values initialized in .cc file
     static const std::vector<std::string> MergeTypeNames_;
 

diff --git a/EventFilter/Utilities/interface/EvFOutputModule.h b/EventFilter/Utilities/interface/EvFOutputModule.h
diff --git a/EventFilter/Utilities/plugins/modules.cc b/EventFilter/Utilities/plugins/modules.cc
@@ -1,5 +1,4 @@
 #include "EventFilter/Utilities/interface/EvFDaqDirector.h"
-#include "EventFilter/Utilities/interface/EvFOutputModule.h"
 #include "EventFilter/Utilities/interface/FastMonitoringService.h"
 #include "EventFilter/Utilities/interface/FedRawDataInputSource.h"
 #include "EventFilter/Utilities/interface/DAQSource.h"
@@ -29,7 +28,6 @@ DEFINE_FWK_SERVICE(EvFDaqDirector);
 DEFINE_FWK_MODULE(ExceptionGenerator);
 DEFINE_FWK_MODULE(EvFFEDSelector);
 DEFINE_FWK_MODULE(EvFFEDExcluder);
-DEFINE_FWK_MODULE(EvFOutputModule);
 DEFINE_FWK_MODULE(DaqFakeReader);
 DEFINE_FWK_INPUT_SOURCE(FedRawDataInputSource);
 DEFINE_FWK_INPUT_SOURCE(DAQSource);