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

[tree,io] prevent integer overflow when dealing with cachesize #14818

Merged
merged 1 commit into from
Apr 8, 2024

Conversation

ferdymercury
Copy link
Contributor

This Pull request:

Changes or fixes:

Fixes #9292

Checklist:

  • tested changes locally
  • updated the docs (if necessary)

@phsft-bot
Copy link
Collaborator

Starting build on ROOT-performance-centos8-multicore/soversion, ROOT-ubuntu2204/nortcxxmod, ROOT-ubuntu2004/python3, mac12arm/cxx20, windows10/default
How to customize builds

1 similar comment
@phsft-bot
Copy link
Collaborator

Starting build on ROOT-performance-centos8-multicore/soversion, ROOT-ubuntu2204/nortcxxmod, ROOT-ubuntu2004/python3, mac12arm/cxx20, windows10/default
How to customize builds

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-ubuntu2204/nortcxxmod.
Running on root-ubuntu-2204-1.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-ubuntu2004/python3.
Running on root-ubuntu-2004-1.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-performance-centos8-multicore/soversion.
Running on olbdw-01.cern.ch:/data/sftnight/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on mac12arm/cxx20.
Running on 194.12.161.128:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on windows10/default.
Running on null:C:\build\workspace\root-pullrequests-build
See console output.

Failing tests:

Copy link

github-actions bot commented Feb 25, 2024

Test Results

    11 files      11 suites   1d 22h 3m 20s ⏱️
 2 607 tests  2 607 ✅ 0 💤 0 ❌
26 830 runs  26 830 ✅ 0 💤 0 ❌

Results for commit 17ef9be.

♻️ This comment has been updated with latest results.

ferdymercury added a commit to ferdymercury/roottest that referenced this pull request Feb 25, 2024
@ferdymercury
Copy link
Contributor Author

ferdymercury commented Mar 8, 2024

@pcanal is there a way to re-run the CI against this roottest PR ? https://github.com/root-project/roottest/pull/1069/files

@pcanal
Copy link
Member

pcanal commented Mar 8, 2024

is there a way to re-run the CI against this roottest PR ? root-project/roottest#1069 (files)

If/when the new CI or jenkins build are re-run they will pick up the new branch since it has the same name as this PR's branch.

However the change is surprising:

-Estimate cluster size: 3
+Estimate cluster size: 3030

does not seem like it is close to the limits and is unclear why it is changed.

@phsft-bot
Copy link
Collaborator

Starting build on ROOT-performance-centos8-multicore/soversion, ROOT-ubuntu2204/nortcxxmod, ROOT-ubuntu2004/python3, mac12arm/cxx20, windows10/default
How to customize builds

@ferdymercury
Copy link
Contributor Author

is there a way to re-run the CI against this roottest PR ? root-project/roottest#1069 (files)

If/when the new CI or jenkins build are re-run they will pick up the new branch since it has the same name as this PR's branch.

However the change is surprising:

-Estimate cluster size: 3
+Estimate cluster size: 3030

does not seem like it is close to the limits and is unclear why it is changed.

This is because, there was some clamping happening, but the value of cacheSize was not being taken into account, as this line was missing in the code:
cacheSize = pf->GetBufferSize();

@phsft-bot
Copy link
Collaborator

Starting build on ROOT-performance-centos8-multicore/soversion, ROOT-ubuntu2204/nortcxxmod, ROOT-ubuntu2004/python3, mac12arm/cxx20, windows10/default
How to customize builds

@phsft-bot
Copy link
Collaborator

Starting build on ROOT-performance-centos8-multicore/soversion, ROOT-ubuntu2204/nortcxxmod, ROOT-ubuntu2004/python3, mac12arm/cxx20, windows10/default
How to customize builds

@phsft-bot
Copy link
Collaborator

Build failed on windows10/default.
See console output.

Copy link
Member

@pcanal pcanal left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks.

@pcanal
Copy link
Member

pcanal commented Apr 5, 2024

@phsft-bot build

@ferdymercury ferdymercury added this to the 6.32/00 milestone Apr 6, 2024
@pcanal
Copy link
Member

pcanal commented Apr 6, 2024

@phsft-bot build

@pcanal pcanal merged commit 0f2bb47 into root-project:master Apr 8, 2024
14 of 16 checks passed
@guitargeek
Copy link
Contributor

@pcanal, @ferdymercury, this PR caused a regression in a unit test that I see in other PRs, e.g.:
#15173

pcanal pushed a commit to root-project/roottest that referenced this pull request Apr 9, 2024
@pcanal
Copy link
Member

pcanal commented Apr 9, 2024

Yes, the companion roottest PR was merged a couple of hours ago. root-project/roottest#1069

@ferdymercury ferdymercury deleted the fillbuffer branch April 9, 2024 06:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Integer overflow in TTreeCache::FillBuffer
4 participants