Restore propagation of CCDB download failure error

shahor02 · shahor02 · commit d7e7e151e100 · 2023-12-08T18:25:40.000+01:00
So that the end user (BasicCCDBManager or DPL CCDBHelper) can decide further steps.
diff --git a/CCDB/include/CCDB/CCDBDownloader.h b/CCDB/include/CCDB/CCDBDownloader.h
@@ -54,7 +54,6 @@ typedef struct DownloaderRequestData {
   std::string userAgent;
 
   std::function<bool(std::string)> localContentCallback;
-  bool errorflag = false;
 } DownloaderRequestData;
 #endif
 
diff --git a/CCDB/src/CCDBDownloader.cxx b/CCDB/src/CCDBDownloader.cxx
@@ -476,23 +476,17 @@ void CCDBDownloader::transferFinished(CURL* easy_handle, CURLcode curlCode)
     } break;
     case ASYNCHRONOUS: {
       DownloaderRequestData* requestData = performData->requestData;
-
       if (requestData->headers) {
         for (auto& p : requestData->hoPair.header) {
           (*requestData->headers)[p.first] = p.second;
         }
       }
-      if (requestData->errorflag && requestData->headers) {
-        (*requestData->headers)["Error"] = "An error occurred during retrieval";
-      }
-
       // Log that transfer finished
       long httpCode;
       curl_easy_getinfo(easy_handle, CURLINFO_RESPONSE_CODE, &httpCode);
       char* url;
       curl_easy_getinfo(easy_handle, CURLINFO_EFFECTIVE_URL, &url);
       LOG(debug) << "Transfer for " << url << " finished with code " << httpCode << "\n";
-
       std::string currentHost = requestData->hosts[performData->hostInd];
       std::string loggingMessage = prepareLogMessage(currentHost, requestData->userAgent, requestData->path, requestData->timestamp, requestData->headers, httpCode);
 
@@ -527,12 +521,18 @@ void CCDBDownloader::transferFinished(CURL* easy_handle, CURLcode curlCode)
 
       if (!rescheduled) {
         // No more transfers will be done for this request, do cleanup specific for ASYNCHRONOUS calls
-        --(*performData->requestsLeft);
-        delete requestData;
-        delete performData->codeDestination;
         if (!contentRetrieved) {
+          if (requestData->hoPair.object) {
+            requestData->hoPair.object->clear();
+          }
+          if (requestData->headers) {
+            (*requestData->headers)["Error"] = "An error occurred during retrieval";
+          }
           LOGP(alarm, "Curl request to {}, response code: {}", url, httpCode);
         }
+        --(*performData->requestsLeft);
+        delete requestData;
+        delete performData->codeDestination;
       }
     } break;
   }
diff --git a/CCDB/src/CcdbApi.cxx b/CCDB/src/CcdbApi.cxx
@@ -1490,12 +1490,6 @@ void CcdbApi::scheduleDownload(RequestContext& requestContext, size_t* requestCo
   auto data = new DownloaderRequestData(); // Deleted in transferFinished of CCDBDownloader.cxx
   data->hoPair.object = &requestContext.dest;
 
-  auto signalError = [&chunk = requestContext.dest, &errorflag = data->errorflag]() {
-    chunk.clear();
-    chunk.reserve(1);
-    errorflag = true;
-  };
-
   std::function<bool(std::string)> localContentCallback = [this, &requestContext](std::string url) {
     return this->loadLocalContentToMemory(requestContext.dest, url);
   };
