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

Fix PPS persistent geometry tag in data GTs #35846

Merged
merged 1 commit into from
Oct 26, 2021

Conversation

malbouis
Copy link
Contributor

PR description:

This PR is a bug-fix for the data GTs with PPS persistent geometry tags introduced in PR#35772 . The newly introduced tag was crashing two RelVal workflows as reported in #35828.

This PR fixes workflow 136.8562 and PR#35761 is fixing the workflow 149.0, as mentioned in #35828 (comment)

The GT diffs are as follows:

dataRun2
https://cms-conddb.cern.ch/cmsDbBrowser/diff/Prod/gts/121X_dataRun2_v10/121X_dataRun2_v8

dataRun2_HEfail
https://cms-conddb.cern.ch/cmsDbBrowser/diff/Prod/gts/121X_dataRun2_HEfail_v10/121X_dataRun2_HEfail_v8

dataRun2_relval
https://cms-conddb.cern.ch/cmsDbBrowser/diff/Prod/gts/121X_dataRun2_relval_v10/121X_dataRun2_relval_v8

dataRun2_PromptLike_HI
https://cms-conddb.cern.ch/cmsDbBrowser/diff/Prod/gts/121X_dataRun2_PromptLike_HI_v8/121X_dataRun2_PromptLike_HI_v9

dataRun3_HLT
https://cms-conddb.cern.ch/cmsDbBrowser/diff/Prod/gts/121X_dataRun3_HLT_v8/121X_dataRun3_HLT_v9

dataRun2_HLT_relval
https://cms-conddb.cern.ch/cmsDbBrowser/diff/Prod/gts/121X_dataRun2_HLT_relval_v8/121X_dataRun2_HLT_relval_v9

dataRun3_Express
https://cms-conddb.cern.ch/cmsDbBrowser/diff/Prod/gts/121X_dataRun3_Express_v10/121X_dataRun3_Express_v9

dataRun3_Prompt
https://cms-conddb.cern.ch/cmsDbBrowser/diff/Prod/gts/121X_dataRun3_Prompt_v8/121X_dataRun3_Prompt_v9

dataRun3
https://cms-conddb.cern.ch/cmsDbBrowser/diff/Prod/gts/121X_dataRun3_v7/121X_dataRun3_v8

PR validation:

It was tested with a few data workflows [*] but for this PR, we should mainly include the failing one as reported above:

runTheMatrix.py -l limited,136.8562 --ibeos -j16

addOnTests.py -j16

[*] 134.813,134.901,136.8642,134.701,134.702,136.768,136.769,136.77,136.771,140.56,140.5611,140.57,134.0,134.99601,134.99602,134.99603,134.99901,138.2,1001.2,1030.0,1040.0,1041.0,138.1,136.897,136.8562,136.8561,136.8501,136.732,136.7721,136.7722,136.789,136.791,136.7952,136.801,136.813,136.825,136.837,136.745,136.756,136.767,136.778,136.868,136.88,136.892,136.897,138.1,138.2,1001.2,1030.0,1040.0,1040.1,1041.0

if this PR is a backport please specify the original PR and why you need to backport that PR:

Not a backport and no backport foreseen.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-35846/26218

@malbouis
Copy link
Contributor Author

test parameters:

  • workflows=136.8562

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

  • Configuration/AlCa (alca)

@cmsbuild, @malbouis, @tvami, @yuanchao, @francescobrivio can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @missirol, @mmusich, @fabiocos, @tocheng this is something you requested to watch as well.
@perrotta, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@malbouis
Copy link
Contributor Author

please test

@malbouis
Copy link
Contributor Author

type bug-fix

@tvami
Copy link
Contributor

tvami commented Oct 26, 2021

urgent

  • this is needed to not break the IB wf 136.8562

@perrotta
Copy link
Contributor

@malbouis @tvami I originally asked to have this fix separated from #35761 just in case we decided to postpone the final DD4Hep migration in a different pre after pre5 (thank you for having quickly prepared and submitted it). Now at the ORP we decided that we can go on with the full switch to DD4Hep already in pre5.
Therefore, could you please confirm that this PR is still needed on top of #35761, and if any special order has to be followed in merging them if so?

@francescobrivio
Copy link
Contributor

@malbouis @tvami I originally asked to have this fix separated from #35761 just in case we decided to postpone the final DD4Hep migration in a different pre after pre5 (thank you for having quickly prepared and submitted it). Now at the ORP we decided that we can go on with the full switch to DD4Hep already in pre5. Therefore, could you please confirm that this PR is still needed on top of #35761, and if any special order has to be followed in merging them if so?

Hi @perrotta yes this PR is still needed as it fixes a different wf (not related to dd4hep).
There is no special order in which to merge them, but after one is merged the other one will probably have conflicts since they are both modifying the autoCond.py file.

@perrotta
Copy link
Contributor

@malbouis @tvami I originally asked to have this fix separated from #35761 just in case we decided to postpone the final DD4Hep migration in a different pre after pre5 (thank you for having quickly prepared and submitted it). Now at the ORP we decided that we can go on with the full switch to DD4Hep already in pre5. Therefore, could you please confirm that this PR is still needed on top of #35761, and if any special order has to be followed in merging them if so?

Hi @perrotta yes this PR is still needed as it fixes a different wf (not related to dd4hep). There is no special order in which to merge them, but after one is merged the other one will probably have conflicts since they are both modifying the autoCond.py file.

Ok, they are touching different lines of code, therefore they won't overwrite each other in autoCond.py.
Let see if being 6 lines apart will be considered enough by github to not trigger a conflict...

@tvami
Copy link
Contributor

tvami commented Oct 26, 2021

Just for the logistics, I'd suggest to merge #35761 first since that needs several signatures, while the this PR is AlCa only so we have higher control over it.

@perrotta
Copy link
Contributor

#35761 has been merged, and there is no need to rebase: 6 lines apart was evidently enough for github

@tvami
Copy link
Contributor

tvami commented Oct 26, 2021

#35761 has been merged, and there is no need to rebase: 6 lines apart was evidently enough for github

This is great! Ok shall we wait for these tests to finish? Or you trust Helena's extensive testing and let's just test this really in the 23:00 IB? @perrotta

@tvami
Copy link
Contributor

tvami commented Oct 26, 2021

+alca

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs after it passes the integration tests. 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)

@perrotta
Copy link
Contributor

perrotta commented Oct 26, 2021

  • And with this PR merged we should have all RelVal wfs fixed in the next IB

@perrotta
Copy link
Contributor

I did not realize that the tests did not finish yet: let wait for it before signing for the merge

@tvami
Copy link
Contributor

tvami commented Oct 26, 2021

I did not realize that the tests did not finish yet: let wait for it before signing for the merge

Yes, it seems it's taking longer than usual.

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c8f074/19958/summary.html
COMMIT: a39a5ce
CMSSW: CMSSW_12_1_X_2021-10-26-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/35846/19958/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 41
  • DQMHistoTests: Total histograms compared: 2797338
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2797310
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 40 files compared)
  • Checked 173 log files, 37 edm output root files, 41 DQM output files
  • TriggerResults: no differences found

@perrotta
Copy link
Contributor

+1

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

5 participants