-
Notifications
You must be signed in to change notification settings - Fork 4.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Can now disable CondorStatusUpdator #37673
Can now disable CondorStatusUpdator #37673
Conversation
-code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-37673/29489
Code check has found code style and quality issues which could be resolved by applying following patch(s)
|
Added a parameter to allow the service to be disabled.
ac7cdf5
to
6174b8c
Compare
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-37673/29490
|
A new Pull Request was created by @Dr15Jones (Chris Jones) for master. It involves the following packages:
@cmsbuild, @smuzaffar, @Dr15Jones, @makortel can you please review it and eventually sign? Thanks. cms-bot commands are listed here |
please test |
@@ -419,6 +425,7 @@ void CondorStatusService::fillDescriptions(ConfigurationDescriptions &descriptio | |||
->setComment("Interval, in seconds, to calculate event rate over (using EMA)"); | |||
desc.addOptionalUntracked<std::string>("tag")->setComment( | |||
"Identifier tag for this process (a value of 'Foo' results in ClassAd attributes of the form 'ChirpCMSSWFoo*')"); | |||
desc.addOptionalUntracked<bool>("disable", false)->setComment("Disable this service"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about inverting the logic along
desc.addOptionalUntracked<bool>("disable", false)->setComment("Disable this service"); | |
desc.addOptionalUntracked<bool>("enable", true)->setComment("Enable this service"); |
? (just thinking if avoiding the double negation of "not disabling" would be more clear)
+1 Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a3514c/24199/summary.html The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
You can see more details here: Comparison Summary@slava77 comparisons for the following workflows were not done due to missing matrix map:
Summary:
|
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-37673/29548
|
Pull request #37673 was updated. @cmsbuild, @smuzaffar, @Dr15Jones, @makortel can you please check and sign again. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry I commented in few drops, these should be all now.
@@ -80,6 +80,7 @@ namespace edm { | |||
edm::ParameterSetID m_processParameterSetID; | |||
|
|||
std::uint_least64_t m_lastEventCount = 0; | |||
bool m_disable = false; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks to be unnecessary
bool m_disable = false; |
@@ -92,10 +93,15 @@ const unsigned int CondorStatusService::m_defaultUpdateInterval; | |||
constexpr float CondorStatusService::m_defaultEmaInterval; | |||
|
|||
CondorStatusService::CondorStatusService(ParameterSet const &pset, edm::ActivityRegistry &ar) | |||
: m_debug(false), m_lastUpdate(0), m_events(0), m_lumis(0), m_runs(0), m_files(0) { | |||
: m_debug(pset.getUntrackedParameter("debug", false)), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Strictly speaking the default value should not be needed because of having default value in the fillDescriptions()
, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
optionals do not get injected into the PSet
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah right, thanks.
m_shouldUpdate.clear(); | ||
if (pset.exists("debug")) { | ||
m_debug = true; | ||
if (not pset.getUntrackedParameter("enable", true)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same question here about the default value.
59a6e09
to
5b59b0b
Compare
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-37673/29551
|
Pull request #37673 was updated. @cmsbuild, @smuzaffar, @Dr15Jones, @makortel can you please check and sign again. |
@cmsbuild, please test |
+1 Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a3514c/24284/summary.html Comparison SummaryThere are some workflows for which there are errors in the baseline: Summary:
|
+1 |
This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @perrotta, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2) |
+1 |
PR description:
Added a parameter to allow the service to be disabled.
PR validation:
Code compiles.
finishes cms-sw/framework-team#389