Merge branch 'dev' into stable-sync

Author: ehellbar

.github/workflows/clean-test.yml

@@ -43,6 +43,15 @@ name: Clean PR checks
         description: build/O2/o2-dataflow-cs8
         type: boolean
         default: true
+      'check_build/O2/o2/aarch64':
+        description: build/O2/o2/aarch64
+        type: boolean
+        default: true
+      'check_build/O2/o2_slc9':
+        description: build/O2/o2_slc9
+        type: boolean
+        default: true
+
 
 permissions: {}
 

.github/workflows/datamodel-doc.yml

@@ -48,6 +48,7 @@ jobs:
         run: |
           python3 -m pip install --user -U numpy nltk
           python3 -m nltk.downloader -d ~/nltk_data punkt
+          python3 -m nltk.downloader -d ~/nltk_data punkt_tab
 
       - name: Generate documentation
         run: exec bash -exo pipefail O2/scripts/datamodel-doc/update-datamodel.sh
@@ -59,6 +60,7 @@ jobs:
         run: |
           # git diff --quiet exits with 1 if any tracked files have changed, and
           # with 0 otherwise.
+          set -e
           if git diff --quiet; then
             exit  # Nothing has changed, so no need to send a PR.
           fi
@@ -68,9 +70,10 @@ jobs:
           git push -f origin auto-datamodel-doc
 
           # Send pull request
-          # We need to use "hub" ourselves because alisw/pull-request gets
+          # We need to use "gh" ourselves because alisw/pull-request gets
           # confused when multiple repos are checked out.
-          hub pull-request -b AliceO2Group:master -h alibuild:auto-datamodel-doc \
-              --no-edit --no-maintainer-edits -m 'Automatic data model update'   \
-              -m "This update to the data model documentation was automatically created from tonight's O2 dev branch." ||
-            :  # If the PR already exists, hub fails, but we've just force-pushed, so we don't need a new PR.
+          GH_TOKEN="$GITHUB_TOKEN" gh pr create -R AliceO2Group/analysis-framework -B master \
+          --no-maintainer-edit -t 'Automatic data model update' -b "This update \
+          to the data model documentation was automatically created from \
+          tonight's O2 dev branch." || true
+          # If the PR already exists, hub fails, but we've just force-pushed, so we don't need a new PR.

.github/workflows/reports.yml

@@ -126,11 +126,6 @@ jobs:
         git config --global user.name "GitHub Action Bot"
         git commit -m "Updated README" -a || echo "No changes to commit"
         git push origin HEAD:changelog -f
-        GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}  \
-          hub pull-request -f -b dev -h changelog \
-              --no-edit --no-maintainer-edits     \
-              'Auto-generated changelog'          \
-              -m 'The following changelog has been automatically generated.' ||
-            # If the PR already exists, the force-push will have updated it.
-            # It's fine if this step fails.
-            true
+        # If the PR already exists, the force-push will have updated it.
+        # It's fine if this step fails.
+        GH_TOKEN=${{ secrets.GITHUB_TOKEN }} gh pr create -B dev -H changelog -t 'Auto-generated changelog' -b 'The following changelog has been automatically generated.' || true

.gitignore

@@ -63,6 +63,7 @@ compile_commands.json
 .vscode
 .ycm_extra_conf.py
 Session.vim
+CMakeLists.txt.user
 
 # Datafiles
 gphysi.dat

CCDB/include/CCDB/CCDBDownloader.h

@@ -87,6 +87,11 @@ curl_socket_t opensocketCallback(void* clientp, curlsocktype purpose, struct cur
  */
 void onUVClose(uv_handle_t* handle);
 
+enum DownloaderErrorLevel {
+  MINOR,
+  SEVERE
+};
+
 /// A class encapsulating and performing simple CURL requests in terms of a so-called CURL multi-handle.
 /// A multi-handle allows to use a connection pool (connection cache) in the CURL layer even
 /// with short-lived CURL easy-handles. Thereby the overhead of connection to servers can be

CCDB/include/CCDB/CcdbApi.h

@@ -629,6 +629,8 @@ class CcdbApi //: public DatabaseInterface
   static std::unique_ptr<TJAlienCredentials> mJAlienCredentials; // access JAliEn credentials
   int mCurlRetries = 3;
   int mCurlDelayRetries = 100000; // in microseconds
+  size_t mCurlTimeoutDownload = 15; // download timeout in seconds, can be configured via ALICEO2_CCDB_CURL_TIMEOUT_DOWNLOAD, updated according to the deployment mode
+  size_t mCurlTimeoutUpload = 15;   // upload timeout in seconds, can be configured via ALICEO2_CCDB_CURL_TIMEOUT_UPLOAD, updated according to the deployment mode
 
   ClassDefNV(CcdbApi, 1);
 };

CCDB/src/CCDBDownloader.cxx

@@ -12,6 +12,7 @@
 #include <CCDB/CCDBDownloader.h>
 #include "CommonUtils/StringUtils.h"
 #include "CCDB/CCDBTimeStampUtils.h"
+#include "Framework/Signpost.h"
 
 #include <curl/curl.h>
 #include <unordered_map>
@@ -29,29 +30,38 @@
 #include <fairlogger/Logger.h>
 #include <boost/asio/ip/host_name.hpp>
 
+O2_DECLARE_DYNAMIC_STACKTRACE_LOG(ccdb_downloader);
+
 namespace o2::ccdb
 {
 
-void uvErrorCheck(int code)
+void uvErrorCheck(int code, DownloaderErrorLevel level)
 {
   if (code != 0) {
     char buf[1000];
     uv_strerror_r(code, buf, 1000);
-    LOG(error) << "CCDBDownloader: UV error - " << buf;
+    O2_SIGNPOST_ID_GENERATE(sid, ccdb_downloader);
+    if (level == SEVERE) {
+      O2_SIGNPOST_EVENT_EMIT_ERROR(ccdb_downloader, sid, "CCDBDownloader", "UV error - %{public}s", buf);
+    } else {
+      O2_SIGNPOST_EVENT_EMIT_WARN(ccdb_downloader, sid, "CCDBDownloader", "UV minor error - %{public}s", buf);
+    }
   }
 }
 
 void curlEasyErrorCheck(CURLcode code)
 {
   if (code != CURLE_OK) {
-    LOG(error) << "CCDBDownloader: CURL error - " << curl_easy_strerror(code);
+    O2_SIGNPOST_ID_GENERATE(sid, ccdb_downloader);
+    O2_SIGNPOST_EVENT_EMIT_ERROR(ccdb_downloader, sid, "CCDBDownloader", "CURL error - %{public}s", curl_easy_strerror(code));
   }
 }
 
 void curlMultiErrorCheck(CURLMcode code)
 {
   if (code != CURLM_OK) {
-    LOG(error) << "CCDBDownloader: CURL error - " << curl_multi_strerror(code);
+    O2_SIGNPOST_ID_GENERATE(sid, ccdb_downloader);
+    O2_SIGNPOST_EVENT_EMIT_ERROR(ccdb_downloader, sid, "CCDBDownloader", "CURL error - %{public}s", curl_multi_strerror(code));
   }
 }
 namespace
@@ -80,9 +90,9 @@ CCDBDownloader::CCDBDownloader(uv_loop_t* uv_loop)
   }
 
   // Preparing timer to be used by curl
-  mTimeoutTimer = new uv_timer_t();
+  mTimeoutTimer = (uv_timer_t*)malloc(sizeof(*mTimeoutTimer));
   mTimeoutTimer->data = this;
-  uvErrorCheck(uv_timer_init(mUVLoop, mTimeoutTimer));
+  uvErrorCheck(uv_timer_init(mUVLoop, mTimeoutTimer), SEVERE);
   mHandleMap[(uv_handle_t*)mTimeoutTimer] = true;
 
   initializeMultiHandle();
@@ -91,7 +101,7 @@ CCDBDownloader::CCDBDownloader(uv_loop_t* uv_loop)
 void CCDBDownloader::setupInternalUVLoop()
 {
   mUVLoop = new uv_loop_t();
-  uvErrorCheck(uv_loop_init(mUVLoop));
+  uvErrorCheck(uv_loop_init(mUVLoop), SEVERE);
 }
 
 void CCDBDownloader::initializeMultiHandle()
@@ -114,7 +124,7 @@ CCDBDownloader::~CCDBDownloader()
 
   if (!mExternalLoop) {
     // Schedule all handles to close. Execute loop to allow them to execute their destructors.
-    while (uv_loop_alive(mUVLoop) && uv_loop_close(mUVLoop) == UV_EBUSY) {
+    while (uv_loop_alive(mUVLoop) || (uv_loop_close(mUVLoop) == UV_EBUSY)) {
       uv_walk(mUVLoop, closeHandles, this);
       uv_run(mUVLoop, UV_RUN_ONCE);
     }
@@ -136,7 +146,7 @@ void closeHandles(uv_handle_t* handle, void* arg)
 void onUVClose(uv_handle_t* handle)
 {
   if (handle != nullptr) {
-    delete handle;
+    free(handle);
   }
 }
 
@@ -147,20 +157,22 @@ void CCDBDownloader::closesocketCallback(void* clientp, curl_socket_t item)
     // If external uv loop is used then the keepalive mechanism is active.
     if (CD->mSocketTimerMap.find(item) != CD->mSocketTimerMap.end()) {
       auto timer = CD->mSocketTimerMap[item];
-      uvErrorCheck(uv_timer_stop(timer));
+      uvErrorCheck(uv_timer_stop(timer), SEVERE);
       // we are getting rid of the uv_timer_t pointer ... so we need
       // to free possibly attached user data pointers as well. Counteracts action of opensocketCallback
       if (timer->data) {
         delete (DataForClosingSocket*)timer->data;
       }
       CD->mSocketTimerMap.erase(item);
       if (close(item) == -1) {
-        LOG(error) << "CCDBDownloader: Socket failed to close";
+        O2_SIGNPOST_ID_GENERATE(sid, ccdb_downloader);
+        O2_SIGNPOST_EVENT_EMIT_ERROR(ccdb_downloader, sid, "CCDBDownloader", "CCDBDownloader: Socket failed to close");
       }
     }
   } else {
     if (close(item) == -1) {
-      LOG(error) << "CCDBDownloader: Socket failed to close";
+      O2_SIGNPOST_ID_GENERATE(sid, ccdb_downloader);
+      O2_SIGNPOST_EVENT_EMIT_ERROR(ccdb_downloader, sid, "CCDBDownloader", "CCDBDownloader: Socket failed to close");
     }
   }
 }
@@ -170,12 +182,13 @@ curl_socket_t opensocketCallback(void* clientp, curlsocktype purpose, struct cur
   auto CD = (CCDBDownloader*)clientp;
   auto sock = socket(address->family, address->socktype, address->protocol);
   if (sock == -1) {
-    LOG(error) << "CCDBDownloader: Socket failed to open";
+    O2_SIGNPOST_ID_GENERATE(sid, ccdb_downloader);
+    O2_SIGNPOST_EVENT_EMIT_ERROR(ccdb_downloader, sid, "CCDBDownloader", "CCDBDownloader: Socket failed to open");
   }
 
   if (CD->mExternalLoop) {
-    CD->mSocketTimerMap[sock] = new uv_timer_t();
-    uvErrorCheck(uv_timer_init(CD->mUVLoop, CD->mSocketTimerMap[sock]));
+    CD->mSocketTimerMap[sock] = (uv_timer_t*)malloc(sizeof(*CD->mSocketTimerMap[sock]));
+    uvErrorCheck(uv_timer_init(CD->mUVLoop, CD->mSocketTimerMap[sock]), SEVERE);
     CD->mHandleMap[(uv_handle_t*)CD->mSocketTimerMap[sock]] = true;
 
     auto data = new DataForClosingSocket();
@@ -194,10 +207,11 @@ void CCDBDownloader::closeSocketByTimer(uv_timer_t* handle)
   auto sock = data->socket;
 
   if (CD->mSocketTimerMap.find(sock) != CD->mSocketTimerMap.end()) {
-    uvErrorCheck(uv_timer_stop(CD->mSocketTimerMap[sock]));
+    uvErrorCheck(uv_timer_stop(CD->mSocketTimerMap[sock]), SEVERE);
     CD->mSocketTimerMap.erase(sock);
     if (close(sock) == -1) {
-      LOG(error) << "CCDBDownloader: Socket failed to close";
+      O2_SIGNPOST_ID_GENERATE(sid, ccdb_downloader);
+      O2_SIGNPOST_EVENT_EMIT_ERROR(ccdb_downloader, sid, "CCDBDownloader", "CCDBDownloader: Socket failed to close");
     }
     delete data;
   }
@@ -213,7 +227,7 @@ void CCDBDownloader::curlTimeout(uv_timer_t* handle)
 
 void CCDBDownloader::curlPerform(uv_poll_t* handle, int status, int events)
 {
-  uvErrorCheck(status);
+  uvErrorCheck(status, MINOR);
   int running_handles;
   int flags = 0;
   if (events & UV_READABLE) {
@@ -252,20 +266,20 @@ int CCDBDownloader::handleSocket(CURL* easy, curl_socket_t s, int action, void*
       }
 
       if (CD->mExternalLoop && CD->mSocketTimerMap.find(s) != CD->mSocketTimerMap.end()) {
-        uvErrorCheck(uv_timer_stop(CD->mSocketTimerMap[s]));
+        uvErrorCheck(uv_timer_stop(CD->mSocketTimerMap[s]), SEVERE);
       }
 
-      uvErrorCheck(uv_poll_start(curl_context->poll_handle, events, curlPerform));
+      uvErrorCheck(uv_poll_start(curl_context->poll_handle, events, curlPerform), SEVERE);
       break;
     case CURL_POLL_REMOVE:
       if (socketp) {
         if (CD->mExternalLoop) {
           // If external loop is used then start the keepalive timeout.
           if (CD->mSocketTimerMap.find(s) != CD->mSocketTimerMap.end()) {
-            uvErrorCheck(uv_timer_start(CD->mSocketTimerMap[s], closeSocketByTimer, CD->mKeepaliveTimeoutMS, 0));
+            uvErrorCheck(uv_timer_start(CD->mSocketTimerMap[s], closeSocketByTimer, CD->mKeepaliveTimeoutMS, 0), SEVERE);
           }
         }
-        uvErrorCheck(uv_poll_stop(((CCDBDownloader::curl_context_t*)socketp)->poll_handle));
+        uvErrorCheck(uv_poll_stop(((CCDBDownloader::curl_context_t*)socketp)->poll_handle), SEVERE);
         CD->destroyCurlContext((CCDBDownloader::curl_context_t*)socketp);
         curlMultiErrorCheck(curl_multi_assign(socketData->curlm, s, nullptr));
       }
@@ -323,9 +337,9 @@ CCDBDownloader::curl_context_t* CCDBDownloader::createCurlContext(curl_socket_t
   context = (curl_context_t*)malloc(sizeof(*context));
   context->CD = this;
   context->sockfd = sockfd;
-  context->poll_handle = new uv_poll_t();
+  context->poll_handle = (uv_poll_t*)malloc(sizeof(*context->poll_handle));
 
-  uvErrorCheck(uv_poll_init_socket(mUVLoop, context->poll_handle, sockfd));
+  uvErrorCheck(uv_poll_init_socket(mUVLoop, context->poll_handle, sockfd), SEVERE);
   mHandleMap[(uv_handle_t*)(context->poll_handle)] = true;
   context->poll_handle->data = context;
 
@@ -335,7 +349,7 @@ CCDBDownloader::curl_context_t* CCDBDownloader::createCurlContext(curl_socket_t
 void CCDBDownloader::curlCloseCB(uv_handle_t* handle)
 {
   auto* context = (curl_context_t*)handle->data;
-  delete context->poll_handle;
+  free(context->poll_handle);
   free(context);
 }
 
@@ -470,6 +484,10 @@ void CCDBDownloader::transferFinished(CURL* easy_handle, CURLcode curlCode)
   bool rescheduled = false;
   bool contentRetrieved = false;
 
+  if (curlCode != 0) {
+    LOG(error) << "CCDBDownloader CURL transfer error - " << curl_easy_strerror(curlCode) << "\n";
+  }
+
   switch (performData->type) {
     case BLOCKING: {
       --(*performData->requestsLeft);
@@ -502,12 +520,17 @@ void CCDBDownloader::transferFinished(CURL* easy_handle, CURLcode curlCode)
         } else if (300 <= httpCode && httpCode < 400 && performData->locInd < locations.size()) {
           followRedirect(performData, easy_handle, locations, rescheduled, contentRetrieved);
         } else if (200 <= httpCode && httpCode < 300) {
-          contentRetrieved = true;
+          contentRetrieved = true; // Can be overruled by following error check
         }
       } else {
         LOG(error) << loggingMessage;
       }
 
+      // Check for errors
+      if (curlCode != 0) {
+        contentRetrieved = false;
+      }
+
       // Check if content was retrieved, or scheduled to be retrieved
       if (!rescheduled && !contentRetrieved && performData->locInd == locations.size()) {
         // Ran out of locations to redirect, try new host
@@ -579,12 +602,12 @@ int CCDBDownloader::startTimeout(CURLM* multi, long timeout_ms, void* userp)
   auto timeout = (uv_timer_t*)userp;
 
   if (timeout_ms < 0) {
-    uvErrorCheck(uv_timer_stop(timeout));
+    uvErrorCheck(uv_timer_stop(timeout), SEVERE);
   } else {
     if (timeout_ms == 0) {
       timeout_ms = 1; // Calling curlTimeout when timeout = 0 could create an infinite loop
     }
-    uvErrorCheck(uv_timer_start(timeout, curlTimeout, timeout_ms, 0));
+    uvErrorCheck(uv_timer_start(timeout, curlTimeout, timeout_ms, 0), SEVERE);
   }
   return 0;
 }