Skip to content

Commit 308da20

Browse files
vdimirvdimir
authored
Merge branch 'master' into vdimir/fix_03221_s3_imds_decent_timeout
2 parents 46f9dbb + e0dc32b commit 308da20

File tree

340 files changed

+6209
-1547
lines changed

Some content is hidden

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

340 files changed

+6209
-1547
lines changed

‎.github/actions/clean/action.yml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
name: Clean runner
22
description: Clean the runner's temp path on ending
3+
inputs:
4+
images:
5+
description: clean docker images
6+
default: false
7+
type: boolean
38
runs:
49
using: "composite"
510
steps:
6-
- name: Clean
11+
- name: Clean Temp
712
shell: bash
813
run: |
9-
docker ps --quiet | xargs --no-run-if-empty docker kill ||:
10-
docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
11-
sudo rm -fr "${{runner.temp}}"
14+
sudo rm -fr "${{runner.temp}}"
15+
- name: Clean Docker Containers
16+
shell: bash
17+
run: |
18+
docker rm -vf $(docker ps -aq) ||:
19+
- name: Clean Docker Images
20+
if: ${{ inputs.images }}
21+
shell: bash
22+
run: |
23+
docker rmi -f $(docker images -aq) ||:

‎.github/workflows/auto_releases.yml‎

Lines changed: 40 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,16 @@ on:
1414
dry-run:
1515
description: 'Dry run'
1616
required: false
17-
default: true
17+
default: false
1818
type: boolean
1919

2020
jobs:
2121
AutoReleaseInfo:
22-
runs-on: [self-hosted, style-checker-aarch64]
22+
runs-on: [self-hosted, release-maker]
2323
outputs:
2424
data: ${{ steps.info.outputs.AUTO_RELEASE_PARAMS }}
2525
dry_run: ${{ steps.info.outputs.DRY_RUN }}
2626
steps:
27-
- name: Debug Info
28-
uses: ./.github/actions/debug
2927
- name: Set envs
3028
run: |
3129
cat >> "$GITHUB_ENV" << 'EOF'
@@ -36,6 +34,10 @@ jobs:
3634
echo "DRY_RUN=true" >> "$GITHUB_ENV"
3735
- name: Check out repository code
3836
uses: ClickHouse/checkout@v1
37+
with:
38+
fetch-depth: 0 # full history needed
39+
- name: Debug Info
40+
uses: ./.github/actions/debug
3941
- name: Prepare Info
4042
id: info
4143
run: |
@@ -46,64 +48,52 @@ jobs:
4648
echo "::endgroup::"
4749
{
4850
echo 'AUTO_RELEASE_PARAMS<<EOF'
49-
cat /tmp/autorelease_info.json
50-
echo 'EOF'
51-
} >> "$GITHUB_ENV"
52-
{
53-
echo 'AUTO_RELEASE_PARAMS<<EOF'
54-
cat /tmp/autorelease_info.json
51+
cat /tmp/autorelease_params.json
5552
echo 'EOF'
5653
} >> "$GITHUB_OUTPUT"
57-
echo "DRY_RUN=true" >> "$GITHUB_OUTPUT"
54+
if [[ "${{ github.event_name }}" == "schedule" ]]; then
55+
echo "DRY_RUN=true" >> "$GITHUB_OUTPUT"
56+
else
57+
echo "DRY_RUN=${{ github.event.inputs.dry-run }}" >> "$GITHUB_OUTPUT"
58+
fi
5859
- name: Post Release Branch statuses
5960
run: |
6061
cd "$GITHUB_WORKSPACE/tests/ci"
6162
python3 auto_release.py --post-status
6263
- name: Clean up
6364
uses: ./.github/actions/clean
6465

65-
Release_0:
66+
Releases:
6667
needs: AutoReleaseInfo
67-
name: Release ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[0].release_branch }}
68-
if: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[0] && fromJson(needs.AutoReleaseInfo.outputs.data).releases[0].ready }}
68+
strategy:
69+
matrix:
70+
release_params: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases }}
71+
max-parallel: 1
72+
name: Release ${{ matrix.release_params.release_branch }}
6973
uses: ./.github/workflows/create_release.yml
7074
with:
71-
ref: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[0].commit_sha }}
75+
ref: ${{ matrix.release_params.commit_sha }}
7276
type: patch
73-
dry-run: ${{ needs.AutoReleaseInfo.outputs.dry_run }}
74-
#
75-
# Release_1:
76-
# needs: [AutoReleaseInfo, Release_0]
77-
# name: Release ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[1].release_branch }}
78-
# if: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[1] && fromJson(needs.AutoReleaseInfo.outputs.data).releases[1].ready }}
79-
# uses: ./.github/workflows/create_release.yml
80-
# with:
81-
# ref: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[1].commit_sha }}
82-
# type: patch
83-
# dry-run: ${{ env.DRY_RUN }}
84-
#
85-
# Release_2:
86-
# needs: [AutoReleaseInfo, Release_1]
87-
# name: Release ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[2].release_branch }}
88-
# if: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[0] && fromJson(needs.AutoReleaseInfo.outputs.data).releases[2].ready }}
89-
# uses: ./.github/workflow/create_release.yml
90-
# with:
91-
# ref: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[0].commit_sha }}
92-
# type: patch
93-
# dry-run: ${{ env.DRY_RUN }}
94-
#
95-
# Release_3:
96-
# needs: [AutoReleaseInfo, Release_2]
97-
# name: Release ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[3].release_branch }}
98-
# if: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[3] && fromJson(needs.AutoReleaseInfo.outputs.data).releases[3].ready }}
99-
# uses: ./.github/workflow/create_release.yml
100-
# with:
101-
# ref: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[3].commit_sha }}
102-
# type: patch
103-
# dry-run: ${{ env.DRY_RUN }}
77+
dry-run: ${{ fromJson(needs.AutoReleaseInfo.outputs.dry_run) }}
78+
secrets:
79+
ROBOT_CLICKHOUSE_COMMIT_TOKEN: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}
80+
81+
CleanUp:
82+
needs: [Releases]
83+
runs-on: [self-hosted, release-maker]
84+
steps:
85+
- uses: ./.github/actions/clean
86+
with:
87+
images: true
10488

105-
# - name: Post Slack Message
89+
# PostSlackMessage:
90+
# needs: [Releases]
91+
# runs-on: [self-hosted, release-maker]
10692
# if: ${{ !cancelled() }}
107-
# run: |
108-
# cd "$GITHUB_WORKSPACE/tests/ci"
109-
# python3 auto_release.py --post-auto-release-complete --wf-status ${{ job.status }}
93+
# steps:
94+
# - name: Check out repository code
95+
# uses: ClickHouse/checkout@v1
96+
# - name: Post
97+
# run: |
98+
# cd "$GITHUB_WORKSPACE/tests/ci"
99+
# python3 auto_release.py --post-auto-release-complete --wf-status ${{ job.status }}

‎.github/workflows/create_release.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ concurrency:
4747
required: false
4848
default: false
4949
type: boolean
50+
secrets:
51+
ROBOT_CLICKHOUSE_COMMIT_TOKEN:
5052

5153
jobs:
5254
CreateRelease:

‎.github/workflows/release_branches.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ jobs:
130130
with:
131131
build_name: package_debug
132132
data: ${{ needs.RunConfig.outputs.data }}
133+
force: true
133134
BuilderBinDarwin:
134135
needs: [RunConfig, BuildDockers]
135136
if: ${{ !failure() && !cancelled() }}

‎README.md‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,32 @@ curl https://clickhouse.com/ | sh
3434

3535
Every month we get together with the community (users, contributors, customers, those interested in learning more about ClickHouse) to discuss what is coming in the latest release. If you are interested in sharing what you've built on ClickHouse, let us know.
3636

37-
* [v24.8 Community Call](https://clickhouse.com/company/events/v24-8-community-release-call) - August 29
37+
* [v24.9 Community Call](https://clickhouse.com/company/events/v24-9-community-release-call) - September 26
3838

3939
## Upcoming Events
4040

4141
Keep an eye out for upcoming meetups and events around the world. Somewhere else you want us to be? Please feel free to reach out to tyler `<at>` clickhouse `<dot>` com. You can also peruse [ClickHouse Events](https://clickhouse.com/company/news-events) for a list of all upcoming trainings, meetups, speaking engagements, etc.
4242

43-
* MORE COMING SOON!
43+
The following upcoming meetups are featuring creator of ClickHouse & CTO, Alexey Milovidov:
44+
45+
* [ClickHouse Guangzhou User Group Meetup](https://mp.weixin.qq.com/s/GSvo-7xUoVzCsuUvlLTpCw) - August 25
46+
* [San Francisco Meetup (Cloudflare)](https://www.meetup.com/clickhouse-silicon-valley-meetup-group/events/302540575) - September 5
47+
* [Raleigh Meetup (Deutsche Bank)](https://www.meetup.com/triangletechtalks/events/302723486/) - September 9
48+
* [New York Meetup (Rokt)](https://www.meetup.com/clickhouse-new-york-user-group/events/302575342) - September 10
49+
* [Chicago Meetup (Jump Capital)](https://lu.ma/43tvmrfw) - September 12
50+
51+
Other upcoming meetups
52+
* [Seattle Meetup (Statsig)](https://www.meetup.com/clickhouse-seattle-user-group/events/302518075/) - August 27
53+
* [Melbourne Meetup](https://www.meetup.com/clickhouse-australia-user-group/events/302732666/) - August 27
54+
* [Sydney Meetup](https://www.meetup.com/clickhouse-australia-user-group/events/302862966/) - September 5
55+
* [Zurich Meetup](https://www.meetup.com/clickhouse-switzerland-meetup-group/events/302267429/) - September 5
56+
* [Toronto Meetup (Shopify)](https://www.meetup.com/clickhouse-toronto-user-group/events/301490855/) - September 10
57+
* [Austin Meetup](https://www.meetup.com/clickhouse-austin-user-group/events/302558689/) - September 17
58+
* [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/302977267) - September 17
4459

4560
## Recent Recordings
4661
* **Recent Meetup Videos**: [Meetup Playlist](https://www.youtube.com/playlist?list=PL0Z2YDlm0b3iNDUzpY1S3L_iV4nARda_U) Whenever possible recordings of the ClickHouse Community Meetups are edited and presented as individual talks. Current featuring "Modern SQL in 2023", "Fast, Concurrent, and Consistent Asynchronous INSERTS in ClickHouse", and "Full-Text Indices: Design and Experiments"
47-
* **Recording available**: [**v24.4 Release Call**](https://www.youtube.com/watch?v=dtUqgcfOGmE) All the features of 24.4, one convenient video! Watch it now!
62+
* **Recording available**: [**v24.8 LTS Release Call**](https://www.youtube.com/watch?v=AeLmp2jc51k) All the features of 24.8 LTS, one convenient video! Watch it now!
4863

4964
## Interested in joining ClickHouse and making it your full-time job?
5065

‎SECURITY.md‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,15 @@ The following versions of ClickHouse server are currently supported with securit
1414

1515
| Version | Supported |
1616
|:-|:-|
17+
| 24.8 | ✔️ |
1718
| 24.7 | ✔️ |
1819
| 24.6 | ✔️ |
19-
| 24.5 | ✔️ |
20+
| 24.5 | ❌ |
2021
| 24.4 | ❌ |
2122
| 24.3 | ✔️ |
2223
| 24.2 | ❌ |
2324
| 24.1 | ❌ |
24-
| 23.12 | ❌ |
25-
| 23.11 | ❌ |
26-
| 23.10 | ❌ |
27-
| 23.9 | ❌ |
28-
| 23.8 | ✔️ |
29-
| 23.7 | ❌ |
30-
| 23.6 | ❌ |
31-
| 23.5 | ❌ |
32-
| 23.4 | ❌ |
33-
| 23.3 | ❌ |
34-
| 23.2 | ❌ |
35-
| 23.1 | ❌ |
25+
| 23.* | ❌ |
3626
| 22.* | ❌ |
3727
| 21.* | ❌ |
3828
| 20.* | ❌ |

‎base/poco/NetSSL_OpenSSL/src/SecureSocketImpl.cpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,14 @@ int SecureSocketImpl::sendBytes(const void* buffer, int length, int flags)
311311
while (mustRetry(rc, remaining_time));
312312
if (rc <= 0)
313313
{
314+
// At this stage we still can have last not yet received SSL message containing SSL error
315+
// so make a read to force SSL to process possible SSL error
316+
if (SSL_get_error(_pSSL, rc) == SSL_ERROR_SYSCALL && SocketImpl::lastError() == POCO_ECONNRESET)
317+
{
318+
char c = 0;
319+
SSL_read(_pSSL, &c, 1);
320+
}
321+
314322
rc = handleError(rc);
315323
if (rc == 0) throw SSLConnectionUnexpectedlyClosedException();
316324
}

‎cmake/freebsd/toolchain-x86_64.cmake‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@ set (CMAKE_CXX_COMPILER_TARGET "x86_64-pc-freebsd11")
88
set (CMAKE_ASM_COMPILER_TARGET "x86_64-pc-freebsd11")
99
set (CMAKE_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/freebsd-x86_64")
1010

11+
# dprintf is used in a patched version of replxx
12+
add_compile_definitions(_WITH_DPRINTF)
13+
1114
set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) # disable linkage check - it doesn't work in CMake

‎contrib/replxx‎

‎docker/keeper/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN arch=${TARGETARCH:-amd64} \
3434
# lts / testing / prestable / etc
3535
ARG REPO_CHANNEL="stable"
3636
ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
37-
ARG VERSION="24.7.3.42"
37+
ARG VERSION="24.8.2.3"
3838
ARG PACKAGES="clickhouse-keeper"
3939
ARG DIRECT_DOWNLOAD_URLS=""
4040

0 commit comments

Comments
 (0)