thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-30 19:42:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
88,193 Commits 9,190 Branches 1,782 Tags 2.2 GiB
a17e8fabec
Commit Graph

445 Commits

Author SHA1 Message Date
mergify[bot]
242efdd0f1
Merge branch 'master' into jdbc-bridge-test 2021-07-27 14:28:27 +00:00
Kseniia Sumarokova
f2e599d8d1
Merge pull request #26826 from kssenii/rabbit-fix-tests 
Try fix rabbitmq tests
 2021-07-27 17:07:37 +03:00
Yatsishin Ilya
f8c7058bcf Better 2021-07-27 10:33:49 +03:00
Vitaly Baranov
72ab7f598c Fix killing unstopped containers in integration tests. 2021-07-27 09:31:04 +03:00
kssenii
1d50e9a3b9 Add retries 2021-07-27 06:16:40 +00:00
Yatsishin Ilya
d11ec777c9 Merge remote-tracking branch 'origin' into integration-6 2021-07-16 16:28:02 +03:00
Yatsishin Ilya
e6b724ad3f postgres rework 2021-07-16 16:26:35 +03:00
Zhichang Yu
5047c758f4 fix per review 2021-07-13 07:20:20 +00:00
Anton Popov
313cd0077d
Fix output of TSV in integration tests 2021-07-12 20:23:19 +03:00
Yatsishin Ilya
a4a960328e Merge remote-tracking branch 'origin' into integration-6 2021-07-12 11:34:23 +03:00
Yatsishin Ilya
143368d8d6 wip 2021-07-12 11:32:20 +03:00
Vitaly Baranov
e7b1e9a2fb
Merge pull request #25986 from vitlibar/fix-flaky-test_dictionaries_all_layouts_separate_sources-test_https 
Fix parallel execution of integration tests
 2021-07-06 09:22:06 +03:00
Vitaly Baranov
cdcc735d83
Merge pull request #25899 from vitlibar/improve-logging-in-integration-tests 
Improve logging in integration tests.
 2021-07-06 08:22:21 +03:00
Vitaly Baranov
87f59ba670 Fix parallel execution of integration tests. 2021-07-05 23:50:04 +03:00
kssenii
32b7d7b750 More correct startup on create query 2021-07-04 19:53:05 +00:00
Vitaly Baranov
618a77fafa Improve logging in integration tests. 2021-07-04 22:24:54 +03:00
Ilya Yatsishin
523155a020
Merge pull request #25908 from arenadata/ADQM-320 2021-07-02 13:25:22 +03:00
Ilya Golshtein
63c71a7b4b kerberized HDFS test fix if run in parallel 2021-07-02 02:12:31 +03:00
alexey-milovidov
919cc10a3c
Merge pull request #25823 from azat/integration-tests-fixes 
tests/integration: use iptables --wait
 2021-07-02 00:58:33 +03:00
Vitaly Baranov
92ace627d2 Correct messages in integration tests. 2021-06-30 14:16:37 +03:00
Azat Khuzhin
283ec54cbe tests/integration: use iptables --wait 
Since integration tests runs in parallel, this should fix:

  test_keeper_persistent_log_multinode/test.py::test_restart_multinode Another app is currently holding the xtables lock. Perhaps you want to use the -w option?

And similar errors.
 2021-06-29 21:07:39 +03:00
Vitaly Baranov
3a3cbeb7aa Collect stderr.log and stdout.log in all integration tests by default. 2021-06-29 17:30:47 +03:00
alesapin
66b7df1d03
Merge pull request #25525 from ClickHouse/fix_some_tests 
Fix some bugs in integration tests
 2021-06-22 10:52:07 +03:00
Ilya Yatsishin
d6bdde54d9
Merge pull request #25212 from qoega/integration-6 
More integration tests improvements
 2021-06-22 10:19:22 +03:00
alesapin
426710f8e3 Followup fix 2021-06-21 18:53:47 +03:00
Yatsishin Ilya
e04957ce82 more 2021-06-21 18:42:40 +03:00
alesapin
8cf5f8e748 Followup fix 2021-06-21 13:30:39 +03:00
alesapin
a63da94ae4 Revert "Merge pull request #25526 from ClickHouse/revert-25459-add_run_id_option" 
This reverts commit 7c7e96f26c, reversing
changes made to a54cbef5b7.
 2021-06-21 11:14:26 +03:00
alesapin
da0a3997f4 Merge branch 'master' into fix_some_tests 2021-06-21 11:14:22 +03:00
alesapin
feecf398fb
Revert "Add run-id option to integration tests" 2021-06-21 11:10:44 +03:00
alesapin
c7781e24d5 Fix some flaky tests 2021-06-21 11:02:27 +03:00
alesapin
65ce3929b8
Merge pull request #25459 from ClickHouse/add_run_id_option 
Add run-id option to integration tests
 2021-06-21 10:21:24 +03:00
alesapin
49cd16e74f Better 2021-06-18 22:08:12 +03:00
kssenii
f33387837e Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into disk-over-web-server 2021-06-18 14:27:48 +00:00
alesapin
8a5bc2e7bc Add run-id option to integration tests 2021-06-18 12:23:22 +03:00
Yatsishin Ilya
f4d587a17a hardening 2021-06-16 15:31:19 +03:00
Nikolai Kochetov
ca66f655c8 Use signal 15 2021-06-16 14:15:08 +03:00
kssenii
2cfcc9980c Better 2021-06-13 19:38:31 +00:00
kssenii
603c06d02e Add test 2021-06-13 19:38:17 +00:00
alexey-milovidov
30f0124e77
Merge branch 'master' into always-detach-parts-with-wrong-partition-id 2021-06-12 02:55:55 +03:00
alexey-milovidov
f96b512ffb
Merge pull request #24728 from qoega/remove-enable-dictionaries 
Remove explicit enable_dictionaries files in integration tests
 2021-06-12 02:45:25 +03:00
alexey-milovidov
cad5cfacf1
Merge pull request #25047 from zhicwu/jdbc-bridge-sit 
Add integration test for jdbc bridge
 2021-06-11 23:07:43 +03:00
Yatsishin Ilya
cbbeb4001b more changes 2021-06-11 15:00:40 +03:00
Yatsishin Ilya
d7fca4a6f2 wait hdfs longer 2021-06-11 12:30:09 +03:00
Zhichun Wu
7f2b444d6f Add integration test for jdbc bridge 2021-06-11 17:10:51 +08:00
Yatsishin Ilya
65074edba4 Merge remote-tracking branch 'origin' into remove-enable-dictionaries 2021-06-11 11:50:56 +03:00
alesapin
54f9db670f
Merge pull request #25079 from ClickHouse/debug_network_interfaces 
Trying to debug fetches bandwith test failures
 2021-06-11 10:30:14 +03:00
Nikolai Kochetov
3bfefa50e2 Add user arg to exec_in_container with cli 2021-06-10 15:15:07 +03:00
Yatsishin Ilya
dd3fd87e26 Fix kerberized hdfs and cleanup 2021-06-09 16:53:16 +03:00
mergify[bot]
bc012b9c1a
Merge branch 'master' into recreate_kafka_table_case 2021-06-09 10:30:32 +00:00
Yatsishin Ilya
aba39d58f9 wip 2021-06-09 12:23:02 +03:00
Nikita Mikhaylov
82b8d45cd7
Merge pull request #23518 from nikitamikhaylov/copier-stuck 
Bugfixes and improvements of `clickhouse-copier`
 2021-06-09 11:36:42 +03:00
alesapin
fc805a1ece Trying to debug fetches bandwith test failures 2021-06-08 15:13:45 +03:00
alexey-milovidov
344fc39e41
Merge branch 'master' into cleanup-iptables-on-session-start 2021-06-07 02:56:32 +03:00
mergify[bot]
1172807442
Merge branch 'master' into recreate_kafka_table_case 2021-06-06 12:15:55 +00:00
Ilya Yatsishin
f2eed22ebd
Merge pull request #24954 from ClickHouse/fix_integration_test 2021-06-05 20:18:33 +03:00
Yatsishin Ilya
df6e163976 fix 2021-06-04 18:46:11 +03:00
Yatsishin Ilya
05232e7c40 Make tests great again 2021-06-04 17:33:22 +03:00
Yatsishin Ilya
e075130112 Remove subprocess_call from cluster.py 2021-06-04 13:14:32 +03:00
alesapin
4d7170b557 Followup fixes for integration tests 2021-06-04 10:51:45 +03:00
Mikhail Filimonov
e11f7db28b
Add test #23430 2021-06-03 20:41:01 +02:00
Nikita Mikhaylov
6c583b0e36 Merge branch 'master' of github.com:ClickHouse/ClickHouse into copier-stuck 2021-06-03 15:05:23 +00:00
alesapin
f0f5aba3b1
Merge pull request #20393 from qoega/integration-2 
Grand integration tests refactoring: Allow parallel run
 2021-06-03 15:20:03 +03:00
alesapin
4a1bf51ad1
Merge branch 'master' into limited_fetches 2021-06-02 23:01:47 +03:00
Yatsishin Ilya
ddddb761db more 2021-06-02 18:08:16 +03:00
Nikita Mikhaylov
312bb96eeb Merge branch 'master' of github.com:ClickHouse/ClickHouse into copier-stuck 2021-06-02 01:04:47 +03:00
Yatsishin Ilya
d51a6a2c1f Merge remote-tracking branch 'origin' into integration-2 2021-06-01 17:23:01 +03:00
Yatsishin Ilya
ff7f7f6200 try 2021-06-01 17:18:35 +03:00
Yatsishin Ilya
2983a9ba61 use cli for exec 2021-06-01 12:53:36 +03:00
Yatsishin Ilya
739ff5fee7 increase docker client timeout 2021-06-01 11:43:44 +03:00
Nikita Mikhaylov
5bd6183e67 save 2021-05-31 17:37:10 +03:00
Nikita Mikhaylov
095f06c8a3 raise timeout for test_host_ip_change/test.py::test_user_access_ip_change 2021-05-28 17:37:05 +03:00
alesapin
2985def91d Add tests 2021-05-27 15:54:47 +03:00
Yatsishin Ilya
ae60a3dd3a new tests from master 2021-05-27 07:24:16 +03:00
Yatsishin Ilya
d17b46d69f fix mongo logging 2021-05-26 15:06:13 +03:00
Yatsishin Ilya
a667a1c032 better 2021-05-25 18:32:24 +03:00
Yatsishin Ilya
8939daf7e7 more 2021-05-24 11:23:04 +03:00
Yatsishin Ilya
c32cea4dd2 Merge remote-tracking branch 'origin' into integration-2 2021-05-24 09:59:16 +03:00
BoloniniD
33755f1f3d Implemented YAMLParser class 2021-05-21 21:56:22 +03:00
Yatsishin Ilya
d73d92ed7e revert some changes 2021-05-21 18:48:14 +03:00
Yatsishin Ilya
daf0b5ad2b rewrite zookeeper test 2021-05-21 16:29:43 +03:00
Yatsishin Ilya
1f8d43235f better 2021-05-20 21:19:45 +03:00
Yatsishin Ilya
1d35da6882 Merge remote-tracking branch 'origin' into integration-2 2021-05-20 19:12:04 +03:00
alesapin
cf94bc9b8c
Merge pull request #24059 from ClickHouse/standalone_keeper 
Standalone keeper server
 2021-05-20 10:10:51 +03:00
Yatsishin Ilya
8932f794aa Merge remote-tracking branch 'origin' into integration-2 2021-05-19 14:15:52 +03:00
Yatsishin Ilya
7a5895815b remove tmpfs for now 2021-05-19 13:23:51 +03:00
Yatsishin Ilya
3ec8e779ba one more timeout 2021-05-19 08:54:48 +03:00
alesapin
974f362e1c
Update cluster.py 2021-05-18 17:25:46 +03:00
Nikolai Kochetov
e71387f509 Increase timeout for server restart in integration tests. 2021-05-18 10:38:32 +03:00
Nikolai Kochetov
e5aff8fe23 Increase timeout for server restart in integration tests. 2021-05-18 10:16:51 +03:00
Nikolai Kochetov
118ebf0463 Increase timeout for server restart in integration tests. 2021-05-17 20:04:43 +03:00
Yatsishin Ilya
40e63646ca more 2021-05-17 14:16:16 +03:00
alesapin
62004cf0d9 Merge branch 'master' into standalone_keeper 2021-05-17 10:14:58 +03:00
Yatsishin Ilya
e1176acc04 Merge remote-tracking branch 'origin' into integration-2 2021-05-17 09:53:00 +03:00
alesapin
5116f79441 Better configs and fix test 2021-05-16 17:18:21 +03:00
alesapin
852608c937 Don't abort on Auth request 2021-05-15 18:01:00 +03:00
alesapin
33e9f1bcf1 Better tests 2021-05-15 15:33:01 +03:00
alesapin
de75d9c887 Revert accident changes 2021-05-14 16:44:32 +03:00
alesapin
123715300a Use keeper in integration tests 2021-05-14 15:30:49 +03:00
Yatsishin Ilya
d0a1dcd6cc better name 2021-05-11 17:27:38 +03:00
Yatsishin Ilya
6aa7c0fafc fixes 2021-05-11 16:13:26 +03:00
Yatsishin Ilya
fddc72fb49 fixes 2021-04-30 15:22:37 +03:00
Yatsishin Ilya
28fe11158a rabbitmq 2021-04-30 12:18:12 +03:00
Yatsishin Ilya
cb101e46bb finally 2021-04-29 14:57:48 +03:00
Yatsishin Ilya
a87fe5e1bc Merge remote-tracking branch 'origin' into integration-2 2021-04-28 17:23:33 +03:00
Yatsishin Ilya
c59a11f798 Merge remote-tracking branch 'origin' into integration-2 2021-04-27 18:34:33 +03:00
Ilya Golshtein
6ae4cc6ca7 hdfs_api.py last minute format improvement went wrong .. fixed 2021-04-27 13:37:54 +03:00
Yatsishin Ilya
73c593f030 better 2021-04-27 12:07:21 +03:00
Ilya Golshtein
95dad032a0 Kerberized HDFS test - retries and extra output if failure 2021-04-26 18:27:41 +03:00
alexey-milovidov
657a76d81c
Update cluster.py 2021-04-25 06:09:42 +03:00
Alexey Milovidov
5558a224b0 Skip CatBoost tests under MSan 2021-04-25 05:25:46 +03:00
Pavel Kovalenko
06fc69a9bc Increase CH start/stop timeouts in integration tests. 2021-04-15 12:44:45 +03:00
Pavel Kovalenko
e53fc635f6 Disk S3 restore test improvements. 2021-04-15 11:26:44 +03:00
Yatsishin Ilya
10b7037d9c Merge remote-tracking branch 'origin' into integration-2 2021-04-14 14:21:40 +03:00
Yatsishin Ilya
70d65c0092 longer timeout 2021-04-13 19:22:10 +03:00
Yatsishin Ilya
b635f17b1b fix 2021-04-13 19:08:29 +03:00
Yatsishin Ilya
c2707a8154 better 2021-04-13 17:55:31 +03:00
Yatsishin Ilya
fb1e2c9006 fix 2021-04-13 14:27:52 +03:00
Yatsishin Ilya
e4d1ea846c more 2021-04-13 13:52:22 +03:00
Azat Khuzhin
fad42f8ac5 tests/integration: stop containers at start only if destroy_dirs is not set 
Fixes tests with multiple clusters - test_zookeeper_config
 2021-04-11 14:49:59 +03:00
Azat Khuzhin
3fa047bb0f tests/integration: run docker-compose commands after copying of compose files 2021-04-11 14:27:15 +03:00
Azat Khuzhin
d4bb4c5dd7 tests/integration: add docker-compose pull retries 2021-04-11 14:27:15 +03:00
Azat Khuzhin
c7bef49b37 tests/integration: drop --force-recreate since we have down/pull separately 2021-04-11 14:27:14 +03:00
Azat Khuzhin
dfcc9bdcb1 tests/integration: pull images in a separate step with --ignore-pull-failures 2021-04-11 14:27:14 +03:00
Azat Khuzhin
df2637e523 tests/integration: stops orphan contains too 2021-04-11 14:27:14 +03:00
Yatsishin Ilya
2cc9d314be fix 2021-04-08 17:43:57 +03:00
Yatsishin Ilya
5311278c29 Merge remote-tracking branch 'origin' into integration-2 2021-04-08 12:30:24 +03:00
Yatsishin Ilya
9115fd8cec wip 2021-04-07 15:22:53 +03:00
alesapin
86a843bb51
Merge pull request #21509 from kssenii/library-bridge 
clickhouse-library-bridge for library dictionary source
 2021-04-06 12:26:08 +03:00
kssenii
9dba529494 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into library-bridge 2021-04-05 13:14:51 +00:00
Yatsishin Ilya
b395838415 Merge remote-tracking branch 'origin' into integration-2 2021-04-05 09:49:11 +03:00
kssenii
13d1f17d3e Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into replicas-shards-for-mysql-and-postgres 2021-04-03 08:00:09 +00:00
Mike Kot
c947280dfc Merge remote-tracking branch 'upstream/master' into feature/attach-partition-local 2021-04-01 21:38:51 +03:00
kssenii
88df6afc84 More tests 2021-03-31 23:48:54 +00:00
kssenii
03ce320926 Add a separate docker-compose with multiple servers for postgres and mysql 2021-03-31 17:04:57 +00:00
Yatsishin Ilya
fb3078a863 Merge remote-tracking branch 'origin' into integration-2 2021-03-26 13:08:39 +03:00
Yatsishin Ilya
3f9b81b0a7 tune 2021-03-26 13:08:24 +03:00
Maksim Kita
bbe1960eea
Merge pull request #21573 from kitaisreal/updated-cache-dictionary-storage 
Added specialized CacheDictionaryStorage
 2021-03-25 21:29:01 +03:00
Mike Kot
285af08949 Merge remote-tracking branch 'upstream/master' into feature/attach-partition-local 2021-03-24 22:34:20 +03:00
kssenii
d9326cc229 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into library-bridge 2021-03-24 18:28:55 +00:00
Yatsishin Ilya
21b0f2bf02 Merge remote-tracking branch 'origin' into integration-2 2021-03-24 13:37:56 +03:00
Mike Kot
5789507e8b Investigating, why the checksums may match when they shouldn't. 2021-03-22 17:23:43 +03:00
kssenii
3b32c8fe9a Block on empty connection pool 2021-03-19 21:00:45 +00:00
Yatsishin Ilya
f14d4be88e change postgres 2021-03-19 19:44:08 +03:00
kssenii
50743b19c4 Add one more test 2021-03-19 16:12:33 +00:00
Yatsishin Ilya
5ae47bd2b4 Merge remote-tracking branch 'origin/master' into integration-2 2021-03-19 15:33:14 +03:00
Yatsishin Ilya
a67f066f0a fixes 2021-03-19 14:44:03 +03:00
Maksim Kita
18ed9c5c67 SSDCacheDictionary remove max_stored_keys option 2021-03-18 12:55:17 +03:00
Yatsishin Ilya
06bb4e2c71 wip 2021-03-16 13:00:49 +03:00
kssenii
5602b82faa Fix test 2021-03-12 14:07:20 +00:00
kssenii
5ff95e615d Add tests 2021-03-11 18:05:08 +00:00
Yatsishin Ilya
e6f90298bb wip 2021-03-09 10:32:10 +03:00
Yatsishin Ilya
534500ef84 wip 2021-03-05 16:39:51 +03:00
Yatsishin Ilya
8b6a64e8b8 typo 2021-03-04 12:07:59 +03:00
Yatsishin Ilya
babea212c7 Merge remote-tracking branch 'origin' into integration-2 2021-03-03 11:56:15 +03:00
Yatsishin Ilya
ec3d63bfe4 add check for fatal 2021-03-03 11:09:44 +03:00
Mike Kot
4e1ac185b5 Merge remote-tracking branch 'upstream/master' into feature/attach-partition-local 2021-03-01 20:58:07 +03:00
Mike Kot
f088dd445d Extended the test to check both the ALTER PARTITION and PART 
Added some notes about the SYSTEM SYNC REPLICA and ALTER ... DROP /
ATTACH.
 2021-03-01 20:41:31 +03:00
Mike Kot
5281314ac0 Finished the test draft for ATTACH PARTITION, 
Extracted the part data corruption function into the helper.
 2021-03-01 16:42:31 +03:00
Mikhail Filimonov
2bcfff257c
Remove most of sleeps in tests 2021-02-25 17:02:59 +01:00
Mikhail Filimonov
6c6eaf2a60
Fixes 2021-02-25 17:02:57 +01:00
Mikhail Filimonov
a4c9e62d6d
Integration tests: introduce wait_for_log_line. 
It uses tail -f executed in container, this way i don't need to pull
the file many times, rememeber positions etc.
 2021-02-25 17:02:56 +01:00
Mikhail Filimonov
32fa3dbc99
Integration tests: add IPC_LOCK and SYS_NICE caps 
It is needed to make integration tests work with a installed binary (/usr/bin/clickhouse) mounted in.
Otherwise the binary mounted in have the capability, while the container is not allowing that
and you get cryptic message:
standard_init_linux.go:211: exec user process caused "operation not permitted"
 2021-02-25 17:02:54 +01:00
Yatsishin Ilya
f8f475e83f fix 2021-02-24 21:24:16 +03:00
Yatsishin Ilya
7c61f6c957 Merge remote-tracking branch 'origin' into integration-2 2021-02-24 15:42:20 +03:00
Yatsishin Ilya
905cc7a2bd fixes 2021-02-24 14:46:58 +03:00
Azat Khuzhin
80f448a466 tests/integration: preserve mysql docker logs in test_materialize_mysql_database 2021-02-20 22:09:01 +03:00
Yatsishin Ilya
775f31f65e fix 2021-02-20 18:23:09 +03:00
Yatsishin Ilya
fc89b4fd35 better 2021-02-20 17:59:39 +03:00
Yatsishin Ilya
65a55b1010 Merge remote-tracking branch 'origin' into integration-2 2021-02-19 20:07:16 +03:00
Yatsishin Ilya
b5f59446b7 fix kerberos 2021-02-19 18:39:27 +03:00
Yatsishin Ilya
ecf928737b fix 2021-02-19 18:08:38 +03:00
Yatsishin Ilya
d45cab4228 wip 2021-02-19 17:42:43 +03:00
Yatsishin Ilya
ee955038c1 wip 2021-02-19 15:58:11 +03:00
Yatsishin Ilya
2df4317aba wip 2021-02-19 00:21:50 +03:00
Alexander Tokmakov
8097532cb7 Merge branch 'master' into database_replicated 2021-02-18 17:42:06 +03:00
Yatsishin Ilya
609c9b272f fix 2021-02-18 16:42:31 +03:00
Yatsishin Ilya
872e36c207 wip 2021-02-18 15:57:45 +03:00
Vitaly Baranov
c704a8cc45 Log stdout and stderr when failed to start docker in integration tests. 2021-02-17 20:07:03 +03:00
Yatsishin Ilya
677528326f postgres 2021-02-17 18:40:01 +03:00
Yatsishin Ilya
8603855f5f fix 2021-02-16 17:16:15 +03:00
Yatsishin Ilya
0b62ef4aa9 more fixes 2021-02-16 10:10:01 +03:00
Yatsishin Ilya
06e1188d9e wip 2021-02-15 12:35:45 +03:00
Yatsishin Ilya
20864076ed wip 2021-02-12 18:51:21 +03:00
Alexander Tokmakov
5e0cbfe972 Merge branch 'master' into database_replicated 2021-02-08 23:01:12 +03:00
Alexander Tokmakov
d010f97db0 Merge branch 'master' into database_replicated 2021-02-03 20:13:25 +03:00
Pavel Kovalenko
b7151aa754 Merge remote-tracking branch 'origin/master' into disk-s3-backup-restore-metadata 
# Conflicts:
#	src/Disks/DiskDecorator.h
#	src/Disks/IDisk.h
#	src/Disks/S3/DiskS3.cpp
 2021-02-03 14:22:18 +03:00
Yatsishin Ilya
19d6e867c6 HDFS test had a clash with 9000 ClickHouse port. 2021-02-02 12:08:47 +03:00
Yatsishin Ilya
01c9b90144 fix project name for clickhouse instance 2021-01-29 19:16:10 +03:00
Yatsishin Ilya
5f6a4ad60d Remove --project-directory for docker-compose. Fix logs formatting from docker container. 2021-01-29 19:16:10 +03:00
alesapin
bcc3c4193e
Merge pull request #19697 from qoega/easier-macro-xml-generate 
No more dicttoxml with excessive logs in integration tests
 2021-01-29 12:00:20 +03:00
alesapin
4a6aef5421 Merge branch 'debug/test_concurrent_ttl_merges' of https://github.com/qoega/ClickHouse into fix_flaky_test_multiple_ttl 2021-01-27 14:51:55 +03:00
Yatsishin Ilya
d21d838604 No more dicttoxml with excessive logs 2021-01-27 12:50:11 +03:00
vdimir
fc8b8d23b2
Merge pull request #18812 from excitoon-favorites/betters3endpoints 
Added prefix-based S3 endpoint settings
 2021-01-26 20:47:57 +03:00
Yatsishin Ilya
403e74d941 Add more debuginfo for test_concurrent_ttl_merges test 2021-01-26 18:12:08 +03:00
Alexander Tokmakov
3bd4d97353 Merge branch 'master' into database_replicated 2021-01-25 14:19:04 +03:00
Vladimir Chebotarev
8ba8e8efd5 Added prefix-based S3 endpoint settings. 2021-01-25 06:40:57 +03:00
Alexander Tokmakov
14e842c197 print stderr of failed subprocess 2021-01-22 17:27:23 +03:00
Alexander Tokmakov
7f97a11c84 Merge branch 'master' into database_replicated 2021-01-18 17:09:39 +03:00
Pavel Kovalenko
1e3a059f64 Merge remote-tracking branch 'origin/master' into disk-s3-backup-restore-metadata 
# Conflicts:
#	src/Disks/DiskCacheWrapper.cpp
#	src/Disks/S3/DiskS3.cpp
 2021-01-18 13:39:49 +03:00