Merge branch 'dev' into monopoles

Author: jackal1-66

.clang-format

@@ -54,3 +54,7 @@ UseTab:          Never
 # Do not format protobuf files
 Language: Proto
 DisableFormat: true
+---
+# Do not format JSON configuration files
+Language: Json
+DisableFormat: true

.github/workflows/clean-test.yml

@@ -24,7 +24,7 @@ name: Clean PR checks
         type: boolean
         default: true
       'check_build/O2/fullCI_slc9':
-        description: build/O2/fullCI
+        description: build/O2/fullCI_slc9
         type: boolean
         default: true
       'check_build/O2/o2-dataflow-slc9':

.github/workflows/stale.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v10
+    - uses: actions/stale@v11
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-pr-message: 'This PR did not have any update in the last 30 days. Is it still needed? Unless further action in will be closed in 5 days.'

CCDB/include/CCDB/CCDBDownloader.h

@@ -53,7 +53,12 @@ typedef struct DownloaderRequestData {
   HeaderObjectPair_t hoPair;
   std::map<std::string, std::string>* headers;
   std::string userAgent;
-  curl_slist* optionsList;
+  // One header list per entry of `hosts`, parallel to it. Per host and not one
+  // shared list because the gate token a broker expects is per endpoint: a
+  // multi-host pool can mix them, and tryNewHost() swapping only the URL left
+  // the second host receiving the first host's token -- answered 401, so the
+  // failover silently retrieved nothing (testCcdbApi multi_host_test).
+  std::vector<curl_slist*> optionsLists;
 
   std::function<bool(std::string)> localContentCallback;
 } DownloaderRequestData;
@@ -304,7 +309,8 @@ class CCDBDownloader
     int hostInd;
     int locInd;
     DownloaderRequestData* requestData;
-    curl_slist** options;
+    // Freed by transferFinished; indexed by hostInd, see DownloaderRequestData.
+    std::vector<curl_slist*>* options;
   } PerformData;
 #endif
 

CCDB/include/CCDB/CcdbApi.h

@@ -18,9 +18,9 @@
 #define PROJECT_CCDBAPI_H
 
 #include <string>
+#include <string_view>
 #include <memory>
 #include <map>
-#include <curl/curl.h>
 #include <TObject.h>
 #include <TMessage.h>
 #include "CCDB/CcdbObjectInfo.h"
@@ -36,17 +36,20 @@
 class TJAlienCredentials;
 #endif
 
-#include "CCDB/CCDBDownloader.h"
+// libcurl and the downloader are implementation details of CcdbApi.cxx;
+// only opaque handles appear below, so neither header is needed here.
+struct curl_slist;
 
 class TFile;
-class TGrid;
+#include <TGrid.h>
 
 namespace o2
 {
 namespace ccdb
 {
 
 class CCDBQuery;
+class CCDBDownloader;
 
 /**
  * Interface to the CCDB.
@@ -56,6 +59,9 @@ class CCDBQuery;
  * @todo handle errors and exceptions
  * @todo extend code coverage
  */
+/// stands in for libcurl's `typedef void CURL` without including <curl/curl.h>
+using CurlHandle = void;
+
 class CcdbApi //: public DatabaseInterface
 {
  public:
@@ -341,7 +347,7 @@ class CcdbApi //: public DatabaseInterface
    * @param curl curl handler
    * @return
    */
-  static void curlSetSSLOptions(CURL* curl);
+  static void curlSetSSLOptions(CurlHandle* curl);
 
   TObject* retrieve(std::string const& path, std::map<std::string, std::string> const& metadata, long timestamp) const;
 
@@ -441,7 +447,7 @@ class CcdbApi //: public DatabaseInterface
    * @param handle CURL handle associated with the request.
    * @param requestCounter Pointer to the variable storing the number of requests to be done.
    */
-  void asynchPerform(CURL* handle, size_t* requestCounter) const;
+  void asynchPerform(CurlHandle* handle, size_t* requestCounter) const;
 
   // internal helper function to update a CCDB file with meta information
   static void updateMetaInformationInLocalFile(std::string const& filename, std::map<std::string, std::string> const* headers, CCDBQuery const* querysummary = nullptr);
@@ -477,7 +483,7 @@ class CcdbApi //: public DatabaseInterface
    * @param endValidityTimestamp End of validity. If omitted or negative, current timestamp + 1 day is used.
    * @return The full url to store an object (url / startValidity / endValidity / [metadata &]* )
    */
-  std::string getFullUrlForStorage(CURL* curl, const std::string& path, const std::string& objtype,
+  std::string getFullUrlForStorage(CurlHandle* curl, const std::string& path, const std::string& objtype,
                                    const std::map<std::string, std::string>& metadata,
                                    long startValidityTimestamp = -1, long endValidityTimestamp = -1, int hostIndex = 0) const;
 
@@ -488,7 +494,7 @@ class CcdbApi //: public DatabaseInterface
    * @param timestamp When the object we retrieve must be valid. If omitted or negative, the current timestamp is used.
    * @return The full url to store an object (url / startValidity / endValidity / [metadata &]* )
    */
-  std::string getFullUrlForRetrieval(CURL* curl, const std::string& path, const std::map<std::string, std::string>& metadata,
+  std::string getFullUrlForRetrieval(CurlHandle* curl, const std::string& path, const std::map<std::string, std::string>& metadata,
                                      long timestamp = -1, int hostIndex = 0) const;
 
  public:
@@ -563,25 +569,24 @@ class CcdbApi //: public DatabaseInterface
 
   /// Queries the CCDB server and navigates through possible redirects until binary content is found; Retrieves content as instance
   /// given by tinfo if that is possible. Returns nullptr if something fails...
-  void* navigateURLsAndRetrieveContent(CURL*, std::string const& url, std::type_info const& tinfo, std::map<std::string, std::string>* headers) const;
+  void* navigateURLsAndRetrieveContent(CurlHandle*, std::string const& url, std::type_info const& tinfo, std::map<std::string, std::string>* headers) const;
 
   // helper that interprets a content chunk as TMemFile and extracts the object therefrom
   static void* interpretAsTMemFileAndExtract(char* contentptr, size_t contentsize, std::type_info const& tinfo);
 
   /**
-   * Initialization of CURL
-   */
+   * Initialization of CurlHandle*/
   void curlInit();
 
   // convert type_info to TClass, throw on failure
   static TClass* tinfo2TClass(std::type_info const& tinfo);
 
   typedef size_t (*CurlWriteCallback)(void*, size_t, size_t, void*);
 
-  void initCurlOptionsForRetrieve(CURL* curlHandle, void* pointer, CurlWriteCallback writeCallback, bool followRedirect = true) const;
+  void initCurlOptionsForRetrieve(CurlHandle* curlHandle, void* pointer, CurlWriteCallback writeCallback, bool followRedirect = true) const;
 
   /// initialize HTTPS header information for the CURL handle. Needs to be given an existing curl_slist* pointer to work with (may be nullptr), which needs to be free by the caller.
-  void initCurlHTTPHeaderOptionsForRetrieve(CURL* curlHandle, curl_slist*& option_list, long timestamp, std::map<std::string, std::string>* headers, std::string const& etag, const std::string& createdNotAfter, const std::string& createdNotBefore) const;
+  void initCurlHTTPHeaderOptionsForRetrieve(CurlHandle* curlHandle, curl_slist*& option_list, long timestamp, std::map<std::string, std::string>* headers, std::string const& etag, const std::string& createdNotAfter, const std::string& createdNotBefore, std::string_view url) const;
 
   bool receiveToFile(FILE* fileHandle, std::string const& path, std::map<std::string, std::string> const& metadata,
                      long timestamp, std::map<std::string, std::string>* headers = nullptr, std::string const& etag = "",
@@ -627,7 +632,7 @@ class CcdbApi //: public DatabaseInterface
 
   // tmp helper and single point of entry for a CURL perform call
   // helps to switch between easy handle perform and multi handles in a single place
-  CURLcode CURL_perform(CURL* handle) const;
+  int CURL_perform(CurlHandle* handle) const; // returns a CURLcode
 
   mutable CCDBDownloader* mDownloader = nullptr; //! the multi-handle (async) CURL downloader
   bool mIsCCDBDownloaderPreferred = false;

CCDB/src/CCDBDownloader.cxx

@@ -365,6 +365,14 @@ void CCDBDownloader::tryNewHost(PerformData* performData, CURL* easy_handle)
   LOG(debug) << "Connecting to another host " << newUrl << "\n";
   requestData->hoPair.header.clear();
   curl_easy_setopt(easy_handle, CURLOPT_URL, newUrl.c_str());
+  // The headers travel with the host, not with the request: a broker mints its
+  // gate token per endpoint, so carrying the previous host's list here is what
+  // made the failover arrive unauthenticated. The lists are built per host by
+  // CcdbApi::scheduleDownload, which is where the token table is visible.
+  if (performData->hostInd < static_cast<int>(requestData->optionsLists.size())) {
+    curl_easy_setopt(easy_handle, CURLOPT_HTTPHEADER,
+                     requestData->optionsLists.at(performData->hostInd));
+  }
   mHandlesToBeAdded.push_back(easy_handle);
 }
 
@@ -568,7 +576,9 @@ void CCDBDownloader::transferFinished(CURL* easy_handle, CURLcode curlCode)
           }
         }
         --(*performData->requestsLeft);
-        curl_slist_free_all(*performData->options);
+        for (auto* optionList : *performData->options) {
+          curl_slist_free_all(optionList);
+        }
         delete requestData;
         delete performData->codeDestination;
         curl_easy_cleanup(easy_handle);
@@ -729,7 +739,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);
+  auto* options = &(requestData->optionsLists);
 
   // Prepare temporary data about transfer
   auto* data = new CCDBDownloader::PerformData(); // Freed in transferFinished