Skip to content

explicitly add CCDB to some CCDB fatal error strings #14081

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.

Sign up for GitHub

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

Merged
davidrohr merged 1 commit into from
Mar 18, 2025
Merged

explicitly add CCDB to some CCDB fatal error strings #14081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CCDB/include/CCDB/BasicCCDBManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ T* CCDBManagerInstance::getSpecificForRun(std::string const& path, int runNumber
auto [start, stop] = getRunDuration(runNumber);
if (start < 0 || stop < 0) {
if (mFatalWhenNull) {
reportFatal(std::string("Failed to get run duration for run ") + std::to_string(runNumber));
reportFatal(std::string("Failed to get run duration for run ") + std::to_string(runNumber) + std::string(" from CCDB"));
}
return nullptr;
}
Expand Down
6 changes: 3 additions & 3 deletions Framework/CCDBSupport/src/CCDBHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ auto populateCacheWith(std::shared_ptr<CCDBFetcherHelper> const& helper,
} else if (meta.defaultValue.get<int>() == 2) {
timestampToUse = std::stoi(dtc.runNumber);
} else {
LOGP(fatal, "Undefined run-dependent option {} for spec {}/{}/{}", meta.defaultValue.get<int>(), concrete.origin.as<std::string>(), concrete.description.as<std::string>(), int(concrete.subSpec));
LOGP(fatal, "Undefined ccdb-run-dependent option {} for spec {}/{}/{}", meta.defaultValue.get<int>(), concrete.origin.as<std::string>(), concrete.description.as<std::string>(), int(concrete.subSpec));
}
} else if (isPrefix(ccdbMetadataPrefix, meta.name)) {
std::string key = meta.name.substr(ccdbMetadataPrefix.size());
Expand Down Expand Up @@ -252,7 +252,7 @@ auto populateCacheWith(std::shared_ptr<CCDBFetcherHelper> const& helper,
LOGP(detail, "Loading {} for timestamp {}", path, timestampToUse);
api.loadFileToMemory(v, path, metadata, timestampToUse, &headers, etag, helper->createdNotAfter, helper->createdNotBefore);
if ((headers.count("Error") != 0) || (etag.empty() && v.empty())) {
LOGP(fatal, "Unable to find object {}/{}", path, timestampToUse);
LOGP(fatal, "Unable to find CCDB object {}/{}", path, timestampToUse);
// FIXME: I should send a dummy message.
continue;
}
Expand Down Expand Up @@ -394,7 +394,7 @@ AlgorithmSpec CCDBHelpers::fetchFromCCDB()
helper->lastCheckedTFCounterOrbReset = timingInfo.tfCounter;
api.loadFileToMemory(v, path, metadata, timingInfo.creation, &headers, etag, helper->createdNotAfter, helper->createdNotBefore);
if ((headers.count("Error") != 0) || (etag.empty() && v.empty())) {
LOGP(fatal, "Unable to find object {}/{}", path, timingInfo.creation);
LOGP(fatal, "Unable to find CCDB object {}/{}", path, timingInfo.creation);
// FIXME: I should send a dummy message.
return;
}
Expand Down
4 changes: 2 additions & 2 deletions Framework/Core/src/DataRefUtils.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ void* DataRefUtils::decodeCCDB(DataRef const& ref, std::type_info const& tinfo)
headerSize = *reinterpret_cast<const int*>(buff + dh->payloadSize - Offset);
}
if (headerSize < 0) {
LOGP(fatal, "Anomalous flattened header size {} extracted", headerSize);
LOGP(fatal, "Anomalous flattened header size {} extracted for CCDB object {}/{}", headerSize, dh->dataOrigin.as<std::string>(), dh->dataDescription.as<std::string>());
}
TMemFile memFile("name", const_cast<char*>(ref.payload), dh->payloadSize - headerSize, "READ");
gErrorIgnoreLevel = previousErrorLevel;
Expand Down Expand Up @@ -128,7 +128,7 @@ std::map<std::string, std::string> DataRefUtils::extractCCDBHeaders(DataRef cons
}

if (headerSize < 0) {
LOGP(fatal, "Anomalous flattened header size {} extracted", headerSize);
LOGP(fatal, "Anomalous flattened header size {} extracted for CCDB object {}/{}", headerSize, dh->dataOrigin.as<std::string>(), dh->dataDescription.as<std::string>());
}

buff += dh->payloadSize - headerSize; // jump to the start of flattened header
Expand Down