From ab019b6321f113601132d2c914b9e0c0fc299e80 Mon Sep 17 00:00:00 2001
From: Ernst Hellbar <ernst.hellbar@cern.ch>
Date: Mon, 10 Mar 2025 17:01:04 +0530
Subject: [PATCH] explicitly add CCDB to some CCDB fatal error strings

---
 CCDB/include/CCDB/BasicCCDBManager.h      | 2 +-
 Framework/CCDBSupport/src/CCDBHelpers.cxx | 6 +++---
 Framework/Core/src/DataRefUtils.cxx       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CCDB/include/CCDB/BasicCCDBManager.h b/CCDB/include/CCDB/BasicCCDBManager.h
index 678bedf24e551..8af1817718fa2 100644
--- a/CCDB/include/CCDB/BasicCCDBManager.h
+++ b/CCDB/include/CCDB/BasicCCDBManager.h
@@ -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;
   }
diff --git a/Framework/CCDBSupport/src/CCDBHelpers.cxx b/Framework/CCDBSupport/src/CCDBHelpers.cxx
index 29d446403e1c8..0db4cbb5ac71d 100644
--- a/Framework/CCDBSupport/src/CCDBHelpers.cxx
+++ b/Framework/CCDBSupport/src/CCDBHelpers.cxx
@@ -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());
@@ -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;
       }
@@ -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;
             }
diff --git a/Framework/Core/src/DataRefUtils.cxx b/Framework/Core/src/DataRefUtils.cxx
index f092429d9c5a0..69eb1dc7faba6 100644
--- a/Framework/Core/src/DataRefUtils.cxx
+++ b/Framework/Core/src/DataRefUtils.cxx
@@ -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;
@@ -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