Skip to content

Commit b5d39ef

Browse files
committed
Update stable-sync to epn-20250605
2 parents 95bbd3f + 81604b4 commit b5d39ef

File tree

1,540 files changed

+67973
-56443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,540 files changed

+67973
-56443
lines changed

.cmake-format.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,6 @@
6666
"HEADERS": '*',
6767
}
6868
},
69-
"o2_target_man_page": {
70-
"kwargs": {
71-
"NAME": '+',
72-
"SECTION": '*',
73-
}
74-
},
7569
"add_root_dictionary": {
7670
"kwargs": {
7771
"LINKDEF": '+',

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
# Dependabot configuration
3+
# Reference: https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
4+
5+
version: 2
6+
updates:
7+
- package-ecosystem: "github-actions" # See documentation for possible values
8+
directory: "/" # Location of package manifests
9+
schedule:
10+
interval: "weekly"

.github/workflows/clean-test.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ name: Clean PR checks
1919
# Warning: the check_* keys are magic and must consist of the string
2020
# "check_" followed by the applicable check name exactly. The
2121
# "description" field is only the human-readable label for the input.
22-
'check_build/O2/o2':
23-
description: build/O2/o2
24-
type: boolean
25-
default: true
2622
'check_build/AliceO2/O2/o2/macOS':
2723
description: build/AliceO2/O2/o2/macOS
2824
type: boolean
@@ -31,14 +27,10 @@ name: Clean PR checks
3127
description: build/AliceO2/O2/o2/macOS-arm
3228
type: boolean
3329
default: true
34-
'check_build/O2/fullCI':
30+
'check_build/O2/fullCI_slc9':
3531
description: build/O2/fullCI
3632
type: boolean
3733
default: true
38-
'check_build/O2/o2-cs8':
39-
description: build/O2/o2-cs8
40-
type: boolean
41-
default: true
4234
'check_build/O2/o2-dataflow-cs8':
4335
description: build/O2/o2-dataflow-cs8
4436
type: boolean

.github/workflows/reports.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
if: github.repository == 'AliceO2Group/AliceO2'
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- name: Set up Python 3.10
2222
uses: actions/setup-python@v5
2323
with:
2424
python-version: '3.10'
25-
- uses: actions/cache@v2
25+
- uses: actions/cache@v4
2626
name: Configure pip caching
2727
with:
2828
path: ~/.cache/pip

Algorithm/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111

1212
o2_add_header_only_library(Algorithm INTERFACE_LINK_LIBRARIES O2::Headers)
1313

14-
o2_target_man_page(Algorithm NAME Algorithm SECTION 3)
15-
o2_target_man_page(Algorithm NAME algorithm_parser SECTION 3)
16-
1714
o2_add_test(o2formatparser
1815
SOURCES test/o2formatparser.cxx
1916
COMPONENT_NAME Algorithm

Algorithm/doc/Algorithm.3.in

Lines changed: 0 additions & 12 deletions
This file was deleted.

Algorithm/doc/algorithm_parser.3.in

Lines changed: 0 additions & 135 deletions
This file was deleted.

CCDB/include/CCDB/BasicCCDBManager.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ class CCDBManagerInstance
194194
/// On error it fatals (if fatal == true) or else returns the pair -1, -1.
195195
std::pair<int64_t, int64_t> getRunDuration(int runnumber, bool fatal = true);
196196
static std::pair<int64_t, int64_t> getRunDuration(o2::ccdb::CcdbApi const& api, int runnumber, bool fatal = true);
197-
197+
static std::pair<int64_t, int64_t> getRunDuration(const MD& headers);
198198
std::string getSummaryString() const;
199199

200200
size_t getFetchedSize() const { return mFetchedSize; }
@@ -330,10 +330,10 @@ T* CCDBManagerInstance::getForRun(std::string const& path, int runNumber, bool s
330330
template <typename T>
331331
T* CCDBManagerInstance::getSpecificForRun(std::string const& path, int runNumber, MD metaData)
332332
{
333-
auto [start, stop] = getRunDuration(runNumber);
333+
auto [start, stop] = getRunDuration(runNumber, mFatalWhenNull);
334334
if (start < 0 || stop < 0) {
335335
if (mFatalWhenNull) {
336-
reportFatal(std::string("Failed to get run duration for run ") + std::to_string(runNumber));
336+
reportFatal(std::string("Failed to get run duration for run ") + std::to_string(runNumber) + std::string(" from CCDB"));
337337
}
338338
return nullptr;
339339
}

CCDB/include/CCDB/CCDBDownloader.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ struct HeaderObjectPair_t {
4747

4848
typedef struct DownloaderRequestData {
4949
std::vector<std::string> hosts;
50+
std::vector<std::string> locations;
5051
std::string path;
5152
long timestamp;
5253
HeaderObjectPair_t hoPair;
@@ -231,12 +232,13 @@ class CCDBDownloader
231232
std::string prepareRedirectedURL(std::string address, std::string potentialHost) const;
232233

233234
/**
234-
* Returns a vector of possible content locations based on the redirect headers.
235+
* Updates the locations vector with the the locations.
235236
*
236-
* @param baseUrl Content path.
237237
* @param headerMap Map containing response headers.
238+
* @param locations Location list to be updated.
239+
* @param locIndex Index of the next locaiton to be tried.
238240
*/
239-
std::vector<std::string> getLocations(std::multimap<std::string, std::string>* headerMap) const;
241+
void updateLocations(std::multimap<std::string, std::string>* headerMap, std::vector<std::string>* locations, int* locIndex) const;
240242

241243
std::string mUserAgentId = "CCDBDownloader";
242244
/**

CCDB/include/CCDB/CcdbApi.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,11 @@ class CcdbApi //: public DatabaseInterface
348348
TObject* retrieveFromTFile(std::string const& path, std::map<std::string, std::string> const& metadata, long timestamp,
349349
std::map<std::string, std::string>* headers, std::string const& etag,
350350
const std::string& createdNotAfter, const std::string& createdNotBefore) const;
351+
void loadFileToMemory(std::vector<char>& dest, std::string const& path,
352+
std::map<std::string, std::string> const& metadata, long timestamp,
353+
std::map<std::string, std::string>* headers, std::string const& etag,
354+
const std::string& createdNotAfter, const std::string& createdNotBefore, bool considerSnapshot = true) const;
355+
351356
#if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__ROOTCLING__) && !defined(__CLING__)
352357
typedef struct RequestContext {
353358
o2::pmr::vector<char>& dest;
@@ -383,7 +388,7 @@ class CcdbApi //: public DatabaseInterface
383388
static bool removeSemaphore(std::string const& name, bool remove = false);
384389
static void removeLeakingSemaphores(std::string const& basedir, bool remove = false);
385390

386-
void loadFileToMemory(o2::pmr::vector<char>& dest, const std::string& path, std::map<std::string, std::string>* localHeaders = nullptr) const;
391+
void loadFileToMemory(o2::pmr::vector<char>& dest, const std::string& path, std::map<std::string, std::string>* localHeaders = nullptr, bool fetchLocalMetaData = true) const;
387392
void loadFileToMemory(o2::pmr::vector<char>& dest, std::string const& path,
388393
std::map<std::string, std::string> const& metadata, long timestamp,
389394
std::map<std::string, std::string>* headers, std::string const& etag,

0 commit comments

Comments
 (0)