Merge branch 'dev' into nn_momentum_vector

Author: ChSonnabend

.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/code-transformations.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.'

.github/workflows/stale.yml

@@ -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/CCDBDownloader.h

@@ -18,6 +18,7 @@
 #define PROJECT_CCDBAPI_H
 
 #include <string>
+#include <string_view>
 #include <memory>
 #include <map>
 #include <curl/curl.h>
@@ -39,7 +40,7 @@ class TJAlienCredentials;
 #include "CCDB/CCDBDownloader.h"
 
 class TFile;
-class TGrid;
+#include <TGrid.h>
 
 namespace o2
 {
@@ -581,7 +582,7 @@ class CcdbApi //: public DatabaseInterface
   void initCurlOptionsForRetrieve(CURL* 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(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, 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 = "",

CCDB/include/CCDB/CcdbApi.h

@@ -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