Repository navigation
[6.42] [io] Do not serve unread blocks from the cache after a read error [rev 2] - #24249
Merged
dpiparo merged 5 commits intoNov 19, 2026
Merged
Conversation
TFileCacheRead::ReadBufferExtNormal sorts the list of blocks to read, which marks it as sorted, before reading them all into fBuffer with TFile::ReadBuffers. When that read fails, e.g. on an XRootD socket timeout, only the request that triggered it reports an error: the following requests for blocks of the same list find them in the list and are served from fBuffer, which still holds the blocks of the previous list, or nothing at all. The baskets of the rest of the cluster are thus unzipped and streamed from unrelated data. Reading LHCb DSTs over XRootD, a single timeout is followed by "Inconsistency found in header (nin=0, nbuf=0)" errors and allocations of several GB from the bogus content. Reset the list of blocks when reading them fails, so that subsequent requests miss the cache and are read from the file. Assisted-by: claude-code:claude-opus-5-5 (cherry picked from commit e4c1e0d)
TTreeCacheUnzip::GetUnzipBuffer reads the requested basket from the file only when TTreeCache::ReadBufferExt reports a miss. When that call itself fails to read the blocks of the cache, it returns -1, and the basket is unzipped from whatever fCompBuffer holds: the previous basket, or uninitialised memory. This happens when learning prefill has filled the cache before the first basket is requested. Treat a failure as a miss, so that the basket is read from the file. Assisted-by: claude-code:claude-opus-5-5 (cherry picked from commit 4eba8ff)
(cherry picked from commit 81a9c4a)
Co-authored-by: Philippe Canal <pcanal@fnal.gov> (cherry picked from commit d62a3bd)
Co-authored-by: Philippe Canal <pcanal@fnal.gov> (cherry picked from commit f7e7691)
root-project-bot
requested review from
bellenot,
jblomer and
pcanal
as code owners
November 19, 2026 12:45
Test Results 24 files 24 suites 4d 0h 31m 43s ⏱️ For more details on these failures, see this check. Results for commit ee84759. |
Member
|
(arbritary comment to test email filter - please ignore - thanks ;) ). |
dpiparo
merged commit Nov 19, 2026
78b4eae
into
root-project:v6-42-00-patches
38 of 40 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #24224, requested by @jblomer.