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

Add CoralServiceWrapper to allow edm::PluginFactory to return std::unique_ptr #25662

Merged
merged 1 commit into from
Jan 15, 2019

Conversation

makortel
Copy link
Contributor

coral::Service has its destructor declared as protected (ownership is managed by intrusive reference counts) which makes it impossible to manage it with std::unique_ptr (without a custom deleter). This PR allows edm::PluginFactory return type to be changed later to std::unique_ptr by adding a wrapper layer for the coral::Service plugin creation.

Tested in CMSSW_10_5_X_2019-01-14-1100, no changes expected.

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-25662/7998

  • This PR adds an extra 12KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @makortel (Matti Kortelainen) for master.

It involves the following packages:

CondCore/CondDB

@ggovi, @cmsbuild can you please review it and eventually sign? Thanks.
@mmusich 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

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-25662/7999

  • This PR adds an extra 12KB to repository

@cmsbuild
Copy link
Contributor

Pull request #25662 was updated. @ggovi, @cmsbuild can you please check and sign again.

@makortel
Copy link
Contributor Author

@ggovi @Dr15Jones This is the result of our email exchange.

@makortel
Copy link
Contributor Author

@cmsbuild, please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 14, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/32598/console Started: 2019/01/14 22:47

DEFINE_EDM_PLUGIN (cond::CoralServicePluginFactory,type,name)

#define DEFINE_CORALSERVICE(type,name) \
DEFINE_EDM_PLUGIN (cond::CoralServicePluginFactory,type,name)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed one of the two (identical) definitions.

<< "Cannot find coral service: "
<< componentname << "\n"
<< "Perhaps the name is misspelled or is not a Plugin?\n"
<< "Try running EdmPluginDump to obtain a list of available Plugins.";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This exception was never thrown (since PluginFactory::create() throws for non-existing plugin), so I removed it.

@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-25662/32598/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 5 differences found in the comparisons
  • DQMHistoTests: Total files compared: 33
  • DQMHistoTests: Total histograms compared: 3153717
  • DQMHistoTests: Total failures: 13
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3153500
  • DQMHistoTests: Total skipped: 204
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 32 files compared)
  • Checked 137 log files, 14 edm output root files, 33 DQM output files

@ggovi
Copy link
Contributor

ggovi commented Jan 15, 2019

+1

@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)

@ggovi
Copy link
Contributor

ggovi commented Jan 15, 2019

@makortel
thanks a lot!

@fabiocos
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 5917a4a into cms-sw:master Jan 15, 2019
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