Skip to content

Fix CCDB DPL fetcher logging and refresh rate check #12484

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
shahor02 merged 2 commits into from
Dec 20, 2023
Merged

Fix CCDB DPL fetcher logging and refresh rate check #12484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c868255
fix logging of CcdbApi (ccdb reads ... logged only at real fetch)
shahor02 Dec 20, 2023
0dbe9e9
Fix check of CCDB query prescaling: account for jumps backward
shahor02 Dec 20, 2023
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
4 changes: 2 additions & 2 deletions CCDB/src/CcdbApi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1689,9 +1689,9 @@ void CcdbApi::vectoredLoadFileToMemory(std::vector<RequestContext>& requestConte
// Save snapshots
for (int i = 0; i < requestContexts.size(); i++) {
auto& requestContext = requestContexts.at(i);
logReading(requestContext.path, requestContext.timestamp, &requestContext.headers,
fmt::format("{}{}", requestContext.considerSnapshot ? "load to memory" : "retrieve", fromSnapshots.at(i) ? " from snapshot" : ""));
if (!requestContext.dest.empty()) {
logReading(requestContext.path, requestContext.timestamp, &requestContext.headers,
fmt::format("{}{}", requestContext.considerSnapshot ? "load to memory" : "retrieve", fromSnapshots.at(i) ? " from snapshot" : ""));
if (requestContext.considerSnapshot && fromSnapshots.at(i) != 2) {
saveSnapshot(requestContext);
}
Expand Down
4 changes: 2 additions & 2 deletions Framework/CCDBSupport/src/CCDBHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ auto populateCacheWith(std::shared_ptr<CCDBFetcherHelper> const& helper,
const auto url2uuid = helper->mapURL2UUID.find(path);
if (url2uuid != helper->mapURL2UUID.end()) {
etag = url2uuid->second.etag;
checkValidity = int(timingInfo.tfCounter - url2uuid->second.lastCheckedTF) >= chRate;
checkValidity = std::abs(int(timingInfo.tfCounter - url2uuid->second.lastCheckedTF)) >= chRate;
} else {
checkValidity = true; // never skip check if the cache is empty
}
Expand Down Expand Up @@ -335,7 +335,7 @@ AlgorithmSpec CCDBHelpers::fetchFromCCDB()
std::map<std::string, std::string> metadata;
std::map<std::string, std::string> headers;
std::string etag;
bool checkValidity = int(timingInfo.tfCounter - helper->lastCheckedTFCounterOrbReset) >= helper->queryPeriodGlo;
bool checkValidity = std::abs(int(timingInfo.tfCounter - helper->lastCheckedTFCounterOrbReset)) >= helper->queryPeriodGlo;
const auto url2uuid = helper->mapURL2UUID.find(path);
if (url2uuid != helper->mapURL2UUID.end()) {
etag = url2uuid->second.etag;
Expand Down