Skip to content
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

Include missing header in ThreadSafeStringCut.h #25261

Merged

Conversation

perrotta
Copy link
Contributor

Not clear why the automatic check did not notice it while merging #25101, but now the following message shows up in the log of the jenkins tests for header consistency:

src/RecoEgamma/EgammaTools/interface/ThreadSafeStringCut.h:40:5: error: 'CMS_THREAD_SAFE' does not name a type; did you mean '_SC_THREADS'?
     CMS_THREAD_SAFE mutable std::mutex mutex_;

The inclusion of

#include "FWCore/Utilities/interface/thread_safety_macros.h"

seems to be missing.

This PR wants to add it

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@perrotta
Copy link
Contributor Author

@guitargeek

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @perrotta for master.

It involves the following packages:

RecoEgamma/EgammaTools

@perrotta, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@jainshilpi, @Sam-Harper, @varuns23, @lgray this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@perrotta
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

The tests are being triggered in jenkins.

@guitargeek
Copy link
Contributor

Thanks Andrea! Sorry for missing that.

@fabiocos
Copy link
Contributor

@smuzaffar @perrotta this is a genuine header problem reported by the check in #25208 that did not directly affect the header, that was anyway not reported in #25101 . Rerunning for #25101 the PR test scram b -k check-headers of CMSSW_10_4_X_2018-11-13-2300 does not mention the affected header. Is it clear why?

As recently we had a number of fake messages in the header check I did not pay too much attention to that and unfortunately I overlooked the report in #25208

@perrotta
Copy link
Contributor Author

@cmsbuild please test
(@smuzaffar : tests are stuck here. I'm trying now to restart them, but if it doesn't work some other action is required)

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 17, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/31711/console Started: 2018/11/17 11:47

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-25261/31711/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 32
  • DQMHistoTests: Total histograms compared: 3013311
  • DQMHistoTests: Total failures: 4
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3013110
  • DQMHistoTests: Total skipped: 197
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 31 files compared)
  • Checked 134 log files, 14 edm output root files, 32 DQM output files

@perrotta
Copy link
Contributor Author

+1

  • Bug fix: included missing header
  • Jenkins tests pass

@cmsbuild
Copy link
Contributor

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. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

@fabiocos
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit ea3c00d into cms-sw:master Nov 17, 2018
@perrotta perrotta deleted the includeMissingHeaderInThreadSafeStringCut branch November 29, 2018 14:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants