Commit Graph

3610 Commits

Author SHA1 Message Date
Robert Schulze
d4737ca033
Merge pull request #50986 from arenadata/ADQM-822
Implement support of encrypted elements in configuration file
2023-07-26 12:27:04 +02:00
Alexander Tokmakov
6bbed6262e
Merge branch 'master' into add_delay_for_replicated 2023-07-26 12:48:48 +03:00
Anton Popov
4531b105ac
Merge branch 'master' into flush-async-insert-queue 2023-07-25 15:48:01 +02:00
Alexander Tokmakov
faca49a905 Merge branch 'master' into add_delay_for_replicated 2023-07-24 16:07:38 +02:00
Anton Popov
347f442f84 Merge remote-tracking branch 'upstream/master' into HEAD 2023-07-24 10:55:31 +00:00
Roman Vasin
0af869ff0f
Merge branch 'master' into ADQM-822 2023-07-24 12:23:11 +03:00
Alexey Milovidov
75efee9675 Fix errors 2023-07-24 05:34:00 +02:00
Alexey Milovidov
a17652a422 Merge branch 'master' into incbin 2023-07-24 05:33:52 +02:00
robot-ch-test-poll4
fb045b0d86
Merge pull request #52498 from ClickHouse/dont_shutdown_interserver_before_tables
Don't shutdown interserver before tables
2023-07-24 01:45:25 +02:00
Alexey Milovidov
1e467867e6 Attempt to fix LTO 2023-07-24 00:03:40 +02:00
alesapin
753a8d0a43 Merge branch 'dont_shutdown_interserver_before_tables' into add_delay_for_replicated 2023-07-23 22:41:15 +02:00
alesapin
e02948580b Don't shutdown interserver before tables 2023-07-23 22:38:59 +02:00
Alexey Milovidov
43bd6d1b83
Revert "Add an ability to specify allocations size for sampling memory profiler" 2023-07-23 19:00:49 +03:00
Alexey Milovidov
00d6f2ee08 Use incbin for resources, part 1 2023-07-23 06:11:03 +02:00
alesapin
d1fa105d60
Merge branch 'master' into add_delay_for_replicated 2023-07-23 00:12:29 +02:00
alesapin
835c36cbf3
Merge pull request #52419 from ClickHouse/implement_borders_for_sampling_memory_profiler
Add an ability to specify allocations size for sampling memory profiler
2023-07-22 18:13:26 +02:00
alesapin
6416fb6eed
Merge branch 'master' into add_delay_for_replicated 2023-07-22 12:11:39 +02:00
robot-ch-test-poll2
69b897d726
Merge pull request #52113 from arenadata/ADQM-996
Collect logs for the system.text_log table even before it is initialized, to record the server startup
2023-07-22 00:01:45 +02:00
Alexander Sapin
4695ec6802 Add an ability to specify allocations size for sampling memory profiler 2023-07-21 14:56:29 +02:00
Antonio Andelic
10c2d5dade
Merge branch 'master' into feature/keeper-dyn-reconf 2023-07-21 13:24:18 +02:00
Dmitry Kardymon
5124f74fcc Merge remote-tracking branch 'origin/master' into ADQM-996 2023-07-21 05:54:36 +00:00
Nikita Mikhaylov
668062dc29
Merge branch 'master' into no-keep-context-lock-while-calculating-access 2023-07-20 14:42:13 +02:00
alesapin
cbcd48979c Fix race one more time 2023-07-20 13:04:43 +02:00
alesapin
8be1454b28 Fix race 2023-07-18 16:06:03 +02:00
Nikita Mikhaylov
ee0bbc0e54
Merge branch 'master' into headers-blacklist 2023-07-17 19:08:52 +02:00
Nikita Mikhaylov
11cc8b4adf
Merge branch 'master' into add_delay_for_replicated 2023-07-17 19:04:29 +02:00
Vitaly Baranov
815a3857de Remove non-const function Context::getClientInfo(). 2023-07-17 15:02:07 +02:00
Antonio Andelic
61dc020b4d
Merge branch 'master' into feature/keeper-dyn-reconf 2023-07-17 12:50:17 +02:00
Dmitry Kardymon
fe6918a9d5 Merge remote-tracking branch 'origin/master' into ADQM-996 2023-07-14 06:56:06 +00:00
Dmitry Kardymon
771b1f8f47 Prototype (working) 2023-07-12 15:48:09 +00:00
pufit
e87e3f8678
Merge branch 'master' into keeper-client-fix-parser 2023-07-11 20:13:51 -04:00
robot-ch-test-poll3
ea7ff2f37e
Merge pull request #51723 from arenadata/ADQM-956
Added ASK_PASSWORD client constant instead of hardcoded '\n'
2023-07-12 00:37:59 +02:00
Mike Kot
d0f81fb1cd fix 2023-07-11 13:33:07 +00:00
Mike Kot
3e8906e5a2 fix build for non-ssl systems 2023-07-11 12:23:10 +00:00
Mike Kot
471e5a056d fix 2023-07-11 10:40:55 +00:00
Roman Vasin
b6023d9f62 Merge branch 'master' of github.com:ClickHouse/ClickHouse into ADQM-822 2023-07-11 10:35:31 +00:00
Mike Kot
23e3c57a6a reload certificates for Keeper 2023-07-11 10:13:30 +00:00
Mike Kot
062b1c464c watch for certificate file updates in configreloader 2023-07-11 10:04:43 +00:00
Alexey Gerasimchuck
8f882b270e
Merge branch 'master' into ADQM-956 2023-07-11 16:02:14 +10:00
Azat Khuzhin
2db092f9d8 Cleanup remote_servers in dist config.xml
At first, there was no such amount of clusters in dist config, they
added when someone need to write some new cluster for tests.

So let's move them to the clusters.xml that is deployed only for tests,
and leave only default cluster.

And cleanup also some configs that had been copied from dist config in
the repo (about test_config_* integration tests, this should be OK,
since there are more_clusters.xml as well, that covers additional
cases).

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2023-07-09 16:55:27 +02:00
Azat Khuzhin
a10aa9ad50 Force libunwind usage (removes gcc_eh support)
libunwind is reentrant and signal safe, and works faster then then
gcc_eh (plus it has some custom patches for problems that have been
found during it's usage in ClickHouse).

gcc_eh may be missing in the system (if gcc was not installed), and
even if it exists clickhouse uses -nodefaultlibs, so some care should be
made to make it work.

Also this library is tiny and there shouln't be any problem to require
it always (there is already tendency to require some contrib libraries,
i.e. poco).

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2023-07-08 20:55:50 +02:00
Alexey Milovidov
52277d6252
Merge pull request #51363 from azat/clickhouse-local-default-settings
Use separate default settings for clickhouse-local
2023-07-08 19:37:27 +03:00
Alexey Milovidov
e4dd603919
Merge pull request #51497 from ClickHouse/fix-shutdown-race
Fix possible race on shutdown wait
2023-07-08 03:03:45 +03:00
Alexander Sapin
e618dd05cc Fix clang tidy and race 2023-07-07 13:03:44 +02:00
Alexey Milovidov
e303afbffb
Merge branch 'master' into fix-incorrect-warning 2023-07-07 13:44:21 +03:00
Nikolay Degterinsky
e98d136243
Merge branch 'master' into headers-blacklist 2023-07-07 04:44:06 +02:00
Alexey Milovidov
3ec617b184 Fix build 2023-07-07 01:31:52 +02:00
Alexander Tokmakov
fdbd59ec6c
Merge pull request #51135 from ClickHouse/fix_trash_in_disks
Try to fix some trash in Disks and part moves
2023-07-07 02:02:17 +03:00
Mike Kot
8b6376005a "reconfig" support for CH Keeper 2023-07-07 00:20:54 +03:00
Alexander Sapin
30bcc73c63 Merge branch 'master' into add_delay_for_replicated 2023-07-06 14:29:15 +02:00