Merge pull request #33644 from smorovic/11_3_X_backport-frontierKey

CondDB frontierKey update (11_3_X)
cms-sw · May 20, 2021 · 8880bb9 · 8880bb9
2 parents e60153e + 55dc9e7
commit 8880bb9
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 21 deletions.
diff --git a/CondCore/DBOutputService/src/OnlineDBOutputService.cc b/CondCore/DBOutputService/src/OnlineDBOutputService.cc
@@ -84,18 +84,11 @@ cond::service::OnlineDBOutputService::OnlineDBOutputService(const edm::Parameter
       m_latencyInLumisections(iConfig.getUntrackedParameter<unsigned int>("latency", 1)),
       m_omsServiceUrl(iConfig.getUntrackedParameter<std::string>("omsServiceUrl", "")),
       m_preLoadConnectionString(iConfig.getUntrackedParameter<std::string>("preLoadConnectionString", "")),
-      m_frontierKey(""),
+      m_frontierKey(iConfig.getUntrackedParameter<std::string>("frontierKey", "")),
       m_debug(iConfig.getUntrackedParameter<bool>("debugLogging", false)) {
   if (m_omsServiceUrl.empty()) {
     m_lastLumiFile = iConfig.getUntrackedParameter<std::string>("lastLumiFile", "");
   }
-  std::string frontierKeyFilePath(iConfig.getUntrackedParameter<std::string>("frontierKeyFilePath", ""));
-  if (!frontierKeyFilePath.empty()) {
-    std::ifstream frontierKeyFile(frontierKeyFilePath);
-    if (!frontierKeyFile)
-      throw Exception(std::string("Can't access frontierKey file ") + frontierKeyFilePath);
-    frontierKeyFile >> m_frontierKey;
-  }
 }
 
 cond::service::OnlineDBOutputService::~OnlineDBOutputService() {}

diff --git a/CondCore/DBOutputService/test/python/testLumiBasedUpdateAnalyzer_oracle.cfg.py b/CondCore/DBOutputService/test/python/testLumiBasedUpdateAnalyzer_oracle.cfg.py
@@ -37,7 +37,7 @@
     preLoadConnectionString = cms.untracked.string('frontier://FrontierPrep/CMS_CONDITIONS'),
     runNumber = cms.untracked.uint64(options.runNumber),
     #lastLumiFile = cms.untracked.string('last_lumi.txt'),
-    #frontierKeyFilePath = cms.untracked.string('frontier.key'),
+    #frontierKey = cms.untracked.string('test'),
     writeTransactionDelay = cms.untracked.uint32(options.transDelay),
     autoCommit = cms.untracked.bool(True),
     saveLogsOnDB = cms.untracked.bool(True),

diff --git a/CondCore/ESSources/plugins/CondDBESSource.cc b/CondCore/ESSources/plugins/CondDBESSource.cc
@@ -141,9 +141,7 @@ CondDBESSource::CondDBESSource(const edm::ParameterSet& iConfig)
     m_connectionString = iConfig.getParameter<std::string>("connect");
 
   // frontier key
-  if (iConfig.exists("frontierKey")) {
-    m_frontierKey = iConfig.getParameter<std::string>("frontierKey");
-  }
+  m_frontierKey = iConfig.getUntrackedParameter<std::string>("frontierKey", "");
 
   // snapshot
   boost::posix_time::ptime snapshotTime;

diff --git a/CondCore/ESSources/test/python/loadall_from_one_record_empty_source_cfg.py b/CondCore/ESSources/test/python/loadall_from_one_record_empty_source_cfg.py
@@ -107,7 +107,7 @@
                                   DBParameters = CondDBParameters,
                                   connect = cms.string( options.connectionString ),
                                   snapshotTime = cms.string( options.snapshotTime ),
-                                  frontierKey = cms.string('abcdefghijklmnopqrstuvwxyz0123456789'),
+                                  frontierKey = cms.untracked.string('abcdefghijklmnopqrstuvwxyz0123456789'),
                                   toGet = cms.VPSet(cms.PSet(
                                       record = cms.string('BeamSpotObjectsRcd'),
                                       tag = cms.string( options.tag ),

diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
@@ -386,8 +386,10 @@
             tag = cms.string(BSOnlineTag),
             timetype = cms.untracked.string('Lumi'),
             onlyAppendUpdatePolicy = cms.untracked.bool(True)
-        ))
+        )),
+        frontierKey = cms.untracked.string(options.runUniqueKey)
     )
+
 else:
     process.OnlineDBOutputService = cms.Service("OnlineDBOutputService",
 
@@ -409,8 +411,10 @@
             tag = cms.string(BSOnlineTag),
             timetype = cms.untracked.string('Lumi'),
             onlyAppendUpdatePolicy = cms.untracked.bool(True)
-        ))
+        )),
+        frontierKey = cms.untracked.string(options.runUniqueKey)
     )
+print("Configured frontierKey", options.runUniqueKey)
 
 #---------
 # Final path

diff --git a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py
@@ -165,8 +165,10 @@
             tag = cms.string(BSOnlineTag),
             timetype = cms.untracked.string('Lumi'),
             onlyAppendUpdatePolicy = cms.untracked.bool(True)
-        ))
+        )),
+        frontierKey = cms.untracked.string(options.runUniqueKey)
     )
+
 else:
     process.OnlineDBOutputService = cms.Service("OnlineDBOutputService",
 
@@ -188,9 +190,12 @@
             tag = cms.string(BSOnlineTag),
             timetype = cms.untracked.string('Lumi'),
             onlyAppendUpdatePolicy = cms.untracked.bool(True)
-        ))
+        )),
+        frontierKey = cms.untracked.string(options.runUniqueKey)
     )
 
+print("Configured frontierKey", options.runUniqueKey)
+
 #---------
 # Final path
 process.p = cms.Path(process.dqmcommon

diff --git a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py
@@ -192,8 +192,10 @@
             tag = cms.string(BSOnlineTag),
             timetype = cms.untracked.string('Lumi'),
             onlyAppendUpdatePolicy = cms.untracked.bool(True)
-        ))
+        )),
+        frontierKey = cms.untracked.string(options.runUniqueKey)
       )
+
     else:
       process.OnlineDBOutputService = cms.Service("OnlineDBOutputService",
         DBParameters = cms.PSet(
@@ -214,9 +216,12 @@
             tag = cms.string(BSOnlineTag),
             timetype = cms.untracked.string('Lumi'),
             onlyAppendUpdatePolicy = cms.untracked.bool(True)
-        ))
+        )),
+        frontierKey = cms.untracked.string(options.runUniqueKey)
       )
 
+    print("Configured frontierKey", options.runUniqueKey)
+
     process.p = cms.Path( process.hltTriggerTypeFilter
                         * process.dqmcommon
                         * process.offlineBeamSpot

diff --git a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py
@@ -136,7 +136,8 @@
           tag = cms.string(BSOnlineTag),
           timetype = cms.untracked.string('Lumi'),
           onlyAppendUpdatePolicy = cms.untracked.bool(True)
-      ))
+      )),
+      frontierKey = cms.untracked.string(options.runUniqueKey)
   )
 
 else:
@@ -160,8 +161,10 @@
         tag = cms.string(BSOnlineTag),
         timetype = cms.untracked.string('Lumi'),
         onlyAppendUpdatePolicy = cms.untracked.bool(True)
-    ))
+    )),
+    frontierKey = cms.untracked.string(options.runUniqueKey)
 )
+print("Configured frontierKey", options.runUniqueKey)
 
 process.p = cms.Path(process.dqmcommon
                     * process.monitor )
diff --git a/DQM/Integration/python/config/fileinputsource_cfi.py b/DQM/Integration/python/config/fileinputsource_cfi.py
@@ -22,6 +22,13 @@
     "Run Keys of CMS"
 )
 
+# Parameter for frontierKey
+options.register('runUniqueKey',
+    'InValid',
+    VarParsing.VarParsing.multiplicity.singleton,
+    VarParsing.VarParsing.varType.string,
+    "Unique run key from RCMS for Frontier")
+
 options.register('runNumber',
                  286520,
                  VarParsing.VarParsing.multiplicity.singleton,

diff --git a/DQM/Integration/python/config/inputsource_cfi.py b/DQM/Integration/python/config/inputsource_cfi.py
@@ -53,6 +53,14 @@
           VarParsing.VarParsing.varType.string,
           "Run Keys of CMS")
 
+# Parameter for frontierKey
+
+options.register ('runUniqueKey',
+          'InValid',
+          VarParsing.VarParsing.multiplicity.singleton,
+          VarParsing.VarParsing.varType.string,
+          "Unique run key from RCMS for Frontier")
+
 options.parseArguments()
 
 # Fix to allow scram to compile

diff --git a/DQM/Integration/python/config/pbsource_cfi.py b/DQM/Integration/python/config/pbsource_cfi.py
@@ -40,6 +40,14 @@
           VarParsing.VarParsing.varType.string,
           "Run Keys of CMS")
 
+# Parameter for frontierKey
+
+options.register ('runUniqueKey',
+          'InValid',
+          VarParsing.VarParsing.multiplicity.singleton,
+          VarParsing.VarParsing.varType.string,
+          "Unique run key from RCMS for Frontier")
+
 options.parseArguments()
 
 # Fix to allow scram to compile

diff --git a/DQM/Integration/python/config/unittestinputsource_cfi.py b/DQM/Integration/python/config/unittestinputsource_cfi.py
@@ -24,6 +24,13 @@
     "Run Keys of CMS"
 )
 
+# Parameter for frontierKey
+options.register('runUniqueKey',
+    'InValid',
+    VarParsing.VarParsing.multiplicity.singleton,
+    VarParsing.VarParsing.varType.string,
+    "Unique run key from RCMS for Frontier")
+
 options.register('runNumber',
                  334393,
                  VarParsing.VarParsing.multiplicity.singleton,