Skip to content

Commit adab0c8

Browse files
sunsingerussunsingerus
authored
Merge pull request #1579 from Altinity/0.24.1
2 parents d7ecc2e + 152a4a5 commit adab0c8

File tree

223 files changed

+9813
-2075
lines changed

Some content is hidden

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

223 files changed

+9813
-2075
lines changed

‎.github/workflows/run_tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
echo " test mode: ${{ github.event.inputs.test_mode }}"
7575
echo " test mask: ${{ github.event.inputs.test_mask }}"
7676
echo
77-
77+
7878
source ~/venv/qa/bin/activate
7979
set -x
8080
set +e # disable the "exit on failure"
@@ -121,7 +121,7 @@ jobs:
121121
retention-days: 90
122122

123123
- name: Test Failed
124-
if: ${{ steps.vars.outputs.test_result != '0' }}
124+
if: ${{ failure() }}
125125
uses: actions/github-script@v3
126126
with:
127127
script: |

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
# Skip logs and caches
2020
log
2121
*.log
22+
*.log.txt
2223
__pycache__
2324

2425
# Skip dev runtime-produced

‎Vagrantfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ end
1818

1919

2020
Vagrant.configure(2) do |config|
21-
config.vm.box = "generic/ubuntu2004"
21+
config.vm.box = "generic/ubuntu2404"
2222
config.vm.box_check_update = false
2323

2424
if get_provider == "hyperv"
@@ -111,7 +111,7 @@ Vagrant.configure(2) do |config|
111111
apt-get install --no-install-recommends -y clickhouse-client
112112
113113
# golang
114-
export GOLANG_VERSION=1.19
114+
export GOLANG_VERSION=1.23
115115
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F6BC817356A3D45E
116116
add-apt-repository ppa:longsleep/golang-backports
117117
apt-get install --no-install-recommends -y golang-${GOLANG_VERSION}-go
@@ -148,7 +148,8 @@ Vagrant.configure(2) do |config|
148148
# MINIKUBE_VERSION=1.19.0
149149
# MINIKUBE_VERSION=1.20.0
150150
# MINIKUBE_VERSION=1.23.2
151-
MINIKUBE_VERSION=1.28.0
151+
# MINIKUBE_VERSION=1.28.0
152+
MINIKUBE_VERSION=1.34.0
152153
wget -c --progress=bar:force:noscroll -O /usr/local/bin/minikube https://github.com/kubernetes/minikube/releases/download/v${MINIKUBE_VERSION}/minikube-linux-amd64
153154
chmod +x /usr/local/bin/minikube
154155
# required for k8s 1.18+
@@ -168,7 +169,8 @@ Vagrant.configure(2) do |config|
168169
# K8S_VERSION=${K8S_VERSION:-1.22.5}
169170
# K8S_VERSION=${K8S_VERSION:-1.23.1}
170171
# K8S_VERSION=${K8S_VERSION:-1.24.8}
171-
K8S_VERSION=${K8S_VERSION:-1.25.4}
172+
# K8S_VERSION=${K8S_VERSION:-1.25.4}
173+
K8S_VERSION=${K8S_VERSION:-1.31.1}
172174
export VALIDATE_YAML=true
173175
174176
killall kubectl || true

‎config/chk/keeper_config.d/01-keeper-01-default-config.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<snapshot_storage_path>/var/lib/clickhouse-keeper/coordination/snapshots</snapshot_storage_path>
1818
<storage_path>/var/lib/clickhouse-keeper</storage_path>
1919
<tcp_port>2181</tcp_port>
20-
<enable_reconfiguration>true</enable_reconfiguration>
2120
</keeper_server>
2221
<listen_host>::</listen_host>
2322
<listen_host>0.0.0.0</listen_host>

‎config/chk/keeper_config.d/01-keeper-03-enable-reconfig.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!-- IMPORTANT -->
2+
<!-- This file is auto-generated -->
3+
<!-- Do not edit this file - all changes would be lost -->
4+
<!-- Edit appropriate template in the following folder: -->
5+
<!-- deploy/builder/templates-config -->
6+
<!-- IMPORTANT -->
7+
<clickhouse>
8+
<keeper_server>
9+
<enable_reconfiguration>false</enable_reconfiguration>
10+
</keeper_server>
11+
</clickhouse>

‎config/config-dev.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,27 @@ label:
351351
# LabelClusterScopeCycleOffset
352352
appendScope: "no"
353353

354+
################################################
355+
##
356+
## Metrics management section
357+
##
358+
################################################
359+
metrics:
360+
labels:
361+
exclude: []
362+
363+
################################################
364+
##
365+
## Status management section
366+
##
367+
################################################
368+
status:
369+
fields:
370+
action: false
371+
actions: false
372+
error: false
373+
errors: false
374+
354375
################################################
355376
##
356377
## StatefulSet management section

‎config/config.yaml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ clickhouse:
147147
# These credentials are used for:
148148
# 1. Metrics requests
149149
# 2. Schema maintenance
150-
# 3. DROP DNS CACHE
151150
# User with these credentials can be specified in additional ClickHouse .xml config files,
152151
# located in 'clickhouse.configuration.file.path.user' folder
153152
username: ""
@@ -351,6 +350,27 @@ label:
351350
# LabelClusterScopeCycleOffset
352351
appendScope: "no"
353352

353+
################################################
354+
##
355+
## Metrics management section
356+
##
357+
################################################
358+
metrics:
359+
labels:
360+
exclude: []
361+
362+
################################################
363+
##
364+
## Status management section
365+
##
366+
################################################
367+
status:
368+
fields:
369+
action: false
370+
actions: false
371+
error: false
372+
errors: false
373+
354374
################################################
355375
##
356376
## StatefulSet management section

‎deploy/builder/templates-config/chk/keeper_config.d/01-keeper-01-default-config.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<snapshot_storage_path>/var/lib/clickhouse-keeper/coordination/snapshots</snapshot_storage_path>
1212
<storage_path>/var/lib/clickhouse-keeper</storage_path>
1313
<tcp_port>2181</tcp_port>
14-
<enable_reconfiguration>true</enable_reconfiguration>
1514
</keeper_server>
1615
<listen_host>::</listen_host>
1716
<listen_host>0.0.0.0</listen_host>

‎deploy/builder/templates-config/chk/keeper_config.d/01-keeper-03-enable-reconfig.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<clickhouse>
2+
<keeper_server>
3+
<enable_reconfiguration>false</enable_reconfiguration>
4+
</keeper_server>
5+
</clickhouse>

‎deploy/builder/templates-config/config.yaml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ clickhouse:
141141
# These credentials are used for:
142142
# 1. Metrics requests
143143
# 2. Schema maintenance
144-
# 3. DROP DNS CACHE
145144
# User with these credentials can be specified in additional ClickHouse .xml config files,
146145
# located in 'clickhouse.configuration.file.path.user' folder
147146
username: "${CH_USERNAME_PLAIN}"
@@ -345,6 +344,27 @@ label:
345344
# LabelClusterScopeCycleOffset
346345
appendScope: "no"
347346

347+
################################################
348+
##
349+
## Metrics management section
350+
##
351+
################################################
352+
metrics:
353+
labels:
354+
exclude: []
355+
356+
################################################
357+
##
358+
## Status management section
359+
##
360+
################################################
361+
status:
362+
fields:
363+
action: false
364+
actions: false
365+
error: false
366+
errors: false
367+
348368
################################################
349369
##
350370
## StatefulSet management section

0 commit comments

Comments
 (0)