From 9df9a2efcc69ae40e731c2ee3bc56e480b473024 Mon Sep 17 00:00:00 2001 From: Srecko Morovic Date: Wed, 5 May 2021 10:52:59 +0200 Subject: [PATCH 1/5] runUniqueKey VarParsing parameter added for the DQM input source --- DQM/Integration/python/config/inputsource_cfi.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/DQM/Integration/python/config/inputsource_cfi.py b/DQM/Integration/python/config/inputsource_cfi.py index 6dd6c788094b1..ebc4a3036d526 100644 --- 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 From e7f81d0d7445e979e17e759dbcbc82a768a2563e Mon Sep 17 00:00:00 2001 From: Srecko Morovic Date: Thu, 6 May 2021 02:24:53 +0200 Subject: [PATCH 2/5] runUniqueKey propagated to beamspot condition-data DQM injector --- .../python/clients/beam_dqm_sourceclient-live_cfg.py | 6 ++++++ .../python/clients/beamfake_dqm_sourceclient-live_cfg.py | 6 ++++++ .../python/clients/beamhlt_dqm_sourceclient-live_cfg.py | 6 ++++++ .../python/clients/beamhltfake_dqm_sourceclient-live_cfg.py | 5 +++++ 4 files changed, 23 insertions(+) diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py index 316b4cf91c64d..fec512497a288 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -385,6 +385,12 @@ onlyAppendUpdatePolicy = cms.untracked.bool(True) )) ) + try: + process.OnlineDBOutputService.frontierKey = cms.untracked.string(options.runUniqueKey) + print("Configured frontierKey", options.runUniqueKey) + except: + pass + else: process.OnlineDBOutputService = cms.Service("OnlineDBOutputService", diff --git a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py index 3765c52e57290..7cc9c6b24150c 100644 --- a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py @@ -163,6 +163,12 @@ onlyAppendUpdatePolicy = cms.untracked.bool(True) )) ) + try: + process.OnlineDBOutputService.frontierKey = cms.untracked.string(options.runUniqueKey) + print("Configured frontierKey", options.runUniqueKey) + except: + pass + else: process.OnlineDBOutputService = cms.Service("OnlineDBOutputService", diff --git a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py index 9fffc4061cba8..5e92f9327b89e 100644 --- a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py @@ -190,6 +190,12 @@ onlyAppendUpdatePolicy = cms.untracked.bool(True) )) ) + try: + process.OnlineDBOutputService.frontierKey = cms.untracked.string(options.runUniqueKey) + print("Configured frontierKey", options.runUniqueKey) + except: + pass + else: process.OnlineDBOutputService = cms.Service("OnlineDBOutputService", DBParameters = cms.PSet( diff --git a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py index a32d96c6d7628..e1edb6115f186 100644 --- a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py @@ -137,6 +137,11 @@ onlyAppendUpdatePolicy = cms.untracked.bool(True) )) ) + try: + process.OnlineDBOutputService.frontierKey = cms.untracked.string(options.runUniqueKey) + print("Configured frontierKey", options.runUniqueKey) + except: + pass else: process.OnlineDBOutputService = cms.Service("OnlineDBOutputService", From f5558250f229faf4c4044e54c7a60c3c099e068f Mon Sep 17 00:00:00 2001 From: Srecko Morovic Date: Thu, 6 May 2021 11:43:47 +0200 Subject: [PATCH 3/5] frontierKey changed to untracked parameter. Output module gets the same parameter instead of checking the file --- CondCore/DBOutputService/src/OnlineDBOutputService.cc | 9 +-------- .../python/testLumiBasedUpdateAnalyzer_oracle.cfg.py | 2 +- CondCore/ESSources/plugins/CondDBESSource.cc | 4 +--- .../python/loadall_from_one_record_empty_source_cfg.py | 2 +- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/CondCore/DBOutputService/src/OnlineDBOutputService.cc b/CondCore/DBOutputService/src/OnlineDBOutputService.cc index 0136c1fc6748b..3896bfc7e8aa0 100644 --- 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("latency", 1)), m_omsServiceUrl(iConfig.getUntrackedParameter("omsServiceUrl", "")), m_preLoadConnectionString(iConfig.getUntrackedParameter("preLoadConnectionString", "")), - m_frontierKey(""), + m_frontierKey(iConfig.getUntrackedParameter("frontierKey", "")), m_debug(iConfig.getUntrackedParameter("debugLogging", false)) { if (m_omsServiceUrl.empty()) { m_lastLumiFile = iConfig.getUntrackedParameter("lastLumiFile", ""); } - std::string frontierKeyFilePath(iConfig.getUntrackedParameter("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 index 586a1cc8c1498..3225c976a3aef 100644 --- 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 index c6968fdee0217..8380f00f9b25c 100644 --- 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("connect"); // frontier key - if (iConfig.exists("frontierKey")) { - m_frontierKey = iConfig.getParameter("frontierKey"); - } + m_frontierKey = iConfig.getUntrackedParameter("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 index efc00d3a582be..919607a996819 100644 --- 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 ), From e8953732494ed308aa2b5756f79cccbaf5b1ec4f Mon Sep 17 00:00:00 2001 From: Srecko Morovic Date: Thu, 13 May 2021 14:55:38 +0200 Subject: [PATCH 4/5] frontier key added to DQM other input source type cfi files. Will have no effect when not used from hltd --- DQM/Integration/python/config/fileinputsource_cfi.py | 7 +++++++ DQM/Integration/python/config/pbsource_cfi.py | 8 ++++++++ DQM/Integration/python/config/unittestinputsource_cfi.py | 7 +++++++ 3 files changed, 22 insertions(+) diff --git a/DQM/Integration/python/config/fileinputsource_cfi.py b/DQM/Integration/python/config/fileinputsource_cfi.py index 6852608194b01..e8312a9bc7cba 100644 --- 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/pbsource_cfi.py b/DQM/Integration/python/config/pbsource_cfi.py index 7ac448d5d7e46..b3ba96c4aafa4 100644 --- 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 index 9742562ae8cea..c6356200fe0c2 100644 --- 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, From 46a4a074d61a123f86893e9cf32c2f4e62bf582c Mon Sep 17 00:00:00 2001 From: Srecko Morovic Date: Mon, 17 May 2021 15:23:17 +0200 Subject: [PATCH 5/5] options.runUniqueKey is added to all input source cfi files, so we can by default propagate it to all OnlineDBOutputService modules in beamspot configurations --- .../clients/beam_dqm_sourceclient-live_cfg.py | 12 +++++------- .../clients/beamfake_dqm_sourceclient-live_cfg.py | 13 ++++++------- .../clients/beamhlt_dqm_sourceclient-live_cfg.py | 13 ++++++------- .../beamhltfake_dqm_sourceclient-live_cfg.py | 12 +++++------- 4 files changed, 22 insertions(+), 28 deletions(-) diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py index fec512497a288..a17413fd7ef77 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -383,13 +383,9 @@ tag = cms.string(BSOnlineTag), timetype = cms.untracked.string('Lumi'), onlyAppendUpdatePolicy = cms.untracked.bool(True) - )) + )), + frontierKey = cms.untracked.string(options.runUniqueKey) ) - try: - process.OnlineDBOutputService.frontierKey = cms.untracked.string(options.runUniqueKey) - print("Configured frontierKey", options.runUniqueKey) - except: - pass else: process.OnlineDBOutputService = cms.Service("OnlineDBOutputService", @@ -412,8 +408,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 index 7cc9c6b24150c..781bbd0af7c07 100644 --- a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py @@ -161,13 +161,9 @@ tag = cms.string(BSOnlineTag), timetype = cms.untracked.string('Lumi'), onlyAppendUpdatePolicy = cms.untracked.bool(True) - )) + )), + frontierKey = cms.untracked.string(options.runUniqueKey) ) - try: - process.OnlineDBOutputService.frontierKey = cms.untracked.string(options.runUniqueKey) - print("Configured frontierKey", options.runUniqueKey) - except: - pass else: process.OnlineDBOutputService = cms.Service("OnlineDBOutputService", @@ -190,9 +186,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 index 5e92f9327b89e..d3aa04b15ac1a 100644 --- a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py @@ -188,13 +188,9 @@ tag = cms.string(BSOnlineTag), timetype = cms.untracked.string('Lumi'), onlyAppendUpdatePolicy = cms.untracked.bool(True) - )) + )), + frontierKey = cms.untracked.string(options.runUniqueKey) ) - try: - process.OnlineDBOutputService.frontierKey = cms.untracked.string(options.runUniqueKey) - print("Configured frontierKey", options.runUniqueKey) - except: - pass else: process.OnlineDBOutputService = cms.Service("OnlineDBOutputService", @@ -216,9 +212,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 index e1edb6115f186..e82364e742665 100644 --- a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py @@ -135,13 +135,9 @@ tag = cms.string(BSOnlineTag), timetype = cms.untracked.string('Lumi'), onlyAppendUpdatePolicy = cms.untracked.bool(True) - )) + )), + frontierKey = cms.untracked.string(options.runUniqueKey) ) - try: - process.OnlineDBOutputService.frontierKey = cms.untracked.string(options.runUniqueKey) - print("Configured frontierKey", options.runUniqueKey) - except: - pass else: process.OnlineDBOutputService = cms.Service("OnlineDBOutputService", @@ -164,8 +160,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 )