CCDBApi: avoid leaking curl handle.

Author: ktf

CCDB/include/CCDB/CCDBDownloader.h

@@ -52,6 +52,7 @@ typedef struct DownloaderRequestData {
   HeaderObjectPair_t hoPair;
   std::map<std::string, std::string>* headers;
   std::string userAgent;
+  curl_slist* optionsList;
 
   std::function<bool(std::string)> localContentCallback;
 } DownloaderRequestData;
@@ -296,6 +297,7 @@ class CCDBDownloader
     int hostInd;
     int locInd;
     DownloaderRequestData* requestData;
+    curl_slist** options;
   } PerformData;
 #endif
 
@@ -421,6 +423,6 @@ typedef struct DataForClosingSocket {
   curl_socket_t socket;
 } DataForClosingSocket;
 
-} // namespace o2
+} // namespace o2::ccdb
 
 #endif // O2_CCDB_CCDBDOWNLOADER_H

CCDB/src/CCDBDownloader.cxx

@@ -535,8 +535,10 @@ void CCDBDownloader::transferFinished(CURL* easy_handle, CURLcode curlCode)
           }
         }
         --(*performData->requestsLeft);
+        curl_slist_free_all(*performData->options);
         delete requestData;
         delete performData->codeDestination;
+        curl_easy_cleanup(easy_handle);
       }
     } break;
   }
@@ -681,6 +683,7 @@ void CCDBDownloader::asynchSchedule(CURL* handle, size_t* requestCounter)
   curl_easy_getinfo(handle, CURLINFO_PRIVATE, &requestData);
   headerMap = &(requestData->hoPair.header);
   hostsPool = &(requestData->hosts);
+  auto* options = &(requestData->optionsList);
 
   // Prepare temporary data about transfer
   auto* data = new CCDBDownloader::PerformData(); // Freed in transferFinished
@@ -692,6 +695,7 @@ void CCDBDownloader::asynchSchedule(CURL* handle, size_t* requestCounter)
   data->hostInd = 0;
   data->locInd = 0;
   data->requestData = requestData;
+  data->options = options;
 
   // Prepare handle and schedule download
   setHandleOptions(handle, data);
@@ -719,4 +723,4 @@ std::string CCDBDownloader::prepareLogMessage(std::string host_url, std::string
   return fmt::format("CcdbDownloader finished transfer {}{}{} for {} (agent_id: {}) with http code: {}", host_url, (host_url.back() == '/') ? "" : "/", upath, (ts < 0) ? getCurrentTimestamp() : ts, userAgent, httpCode);
 }
 
-} // namespace o2
+} // namespace o2::ccdb

CCDB/src/CcdbApi.cxx

@@ -1656,6 +1656,7 @@ void CcdbApi::scheduleDownload(RequestContext& requestContext, size_t* requestCo
   data->timestamp = requestContext.timestamp;
   data->localContentCallback = localContentCallback;
   data->userAgent = mUniqueAgentID;
+  data->optionsList = options_list;
 
   curl_easy_setopt(curl_handle, CURLOPT_URL, fullUrl.c_str());
   initCurlOptionsForRetrieve(curl_handle, (void*)(&data->hoPair), writeCallback, false);

CCDB/test/testCcdbApiDownloader.cxx

@@ -172,7 +172,9 @@ BOOST_AUTO_TEST_CASE(asynch_schedule_test)
     curl_easy_getinfo(handles[i], CURLINFO_HTTP_CODE, &httpCode);
     BOOST_CHECK(httpCode == 200);
     BOOST_CHECK(dests[i]->size() != 0);
-    curl_easy_cleanup(handles[i]);
+    // I suspect the following was needed simply because the rest of the
+    // code was leaking.
+    //    curl_easy_cleanup(handles[i]);
     delete dests[i];
   }
   curl_global_cleanup();