mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-25 09:02:00 +00:00
Fixing configs based on review comments.
This commit is contained in:
Vitaliy Zakaznikov
parent
4a085d7c21
commit
b1d043b7db
@ -1,6 +0,0 @@
|
|||||||
<yandex>
|
|
||||||
<timezone>Europe/Moscow</timezone>
|
|
||||||
<listen_host replace="replace">::</listen_host>
|
|
||||||
<path>/var/lib/clickhouse/</path>
|
|
||||||
<tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
|
|
||||||
</yandex>
|
|
||||||
@ -1,5 +1,4 @@
|
|||||||
<yandex>
|
<yandex>
|
||||||
<shutdown_wait_unfinished>3</shutdown_wait_unfinished>
|
|
||||||
<logger>
|
<logger>
|
||||||
<level>trace</level>
|
<level>trace</level>
|
||||||
<log>/var/log/clickhouse-server/log.log</log>
|
<log>/var/log/clickhouse-server/log.log</log>
|
||||||
|
|||||||
@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<yandex>
|
|
||||||
<https_port>8443</https_port>
|
|
||||||
<tcp_port_secure>9440</tcp_port_secure>
|
|
||||||
</yandex>
|
|
||||||
@ -18,109 +18,6 @@
|
|||||||
</replica>
|
</replica>
|
||||||
</shard>
|
</shard>
|
||||||
</replicated_cluster>
|
</replicated_cluster>
|
||||||
<!--
|
|
||||||
<replicated_cluster_readonly>
|
|
||||||
<shard>
|
|
||||||
<internal_replication>true</internal_replication>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse1</host>
|
|
||||||
<port>9000</port>
|
|
||||||
<user>readonly</user>
|
|
||||||
</replica>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse2</host>
|
|
||||||
<port>9000</port>
|
|
||||||
<user>readonly</user>
|
|
||||||
</replica>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse3</host>
|
|
||||||
<port>9000</port>
|
|
||||||
<user>readonly</user>
|
|
||||||
</replica>
|
|
||||||
</shard>
|
|
||||||
</replicated_cluster_readonly>
|
|
||||||
-->
|
|
||||||
<replicated_cluster_secure>
|
|
||||||
<shard>
|
|
||||||
<internal_replication>true</internal_replication>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse1</host>
|
|
||||||
<port>9440</port>
|
|
||||||
<secure>1</secure>
|
|
||||||
</replica>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse2</host>
|
|
||||||
<port>9440</port>
|
|
||||||
<secure>1</secure>
|
|
||||||
</replica>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse3</host>
|
|
||||||
<port>9440</port>
|
|
||||||
<secure>1</secure>
|
|
||||||
</replica>
|
|
||||||
</shard>
|
|
||||||
</replicated_cluster_secure>
|
|
||||||
<cluster1>
|
|
||||||
<shard>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse1</host>
|
|
||||||
<port>9440</port>
|
|
||||||
<secure>1</secure>
|
|
||||||
</replica>
|
|
||||||
</shard>
|
|
||||||
</cluster1>
|
|
||||||
<sharded_cluster12>
|
|
||||||
<shard>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse1</host>
|
|
||||||
<port>9000</port>
|
|
||||||
</replica>
|
|
||||||
</shard>
|
|
||||||
<shard>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse2</host>
|
|
||||||
<port>9000</port>
|
|
||||||
</replica>
|
|
||||||
</shard>
|
|
||||||
</sharded_cluster12>
|
|
||||||
<one_shard_cluster12>
|
|
||||||
<shard>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse1</host>
|
|
||||||
<port>9000</port>
|
|
||||||
</replica>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse2</host>
|
|
||||||
<port>9000</port>
|
|
||||||
</replica>
|
|
||||||
</shard>
|
|
||||||
</one_shard_cluster12>
|
|
||||||
<sharded_cluster23>
|
|
||||||
<shard>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse2</host>
|
|
||||||
<port>9000</port>
|
|
||||||
</replica>
|
|
||||||
</shard>
|
|
||||||
<shard>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse3</host>
|
|
||||||
<port>9000</port>
|
|
||||||
</replica>
|
|
||||||
</shard>
|
|
||||||
</sharded_cluster23>
|
|
||||||
<one_shard_cluster23>
|
|
||||||
<shard>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse2</host>
|
|
||||||
<port>9000</port>
|
|
||||||
</replica>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse3</host>
|
|
||||||
<port>9000</port>
|
|
||||||
</replica>
|
|
||||||
</shard>
|
|
||||||
</one_shard_cluster23>
|
|
||||||
<sharded_cluster>
|
<sharded_cluster>
|
||||||
<shard>
|
<shard>
|
||||||
<replica>
|
<replica>
|
||||||
@ -141,71 +38,5 @@
|
|||||||
</replica>
|
</replica>
|
||||||
</shard>
|
</shard>
|
||||||
</sharded_cluster>
|
</sharded_cluster>
|
||||||
<one_shard_cluster>
|
|
||||||
<shard>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse1</host>
|
|
||||||
<port>9000</port>
|
|
||||||
</replica>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse2</host>
|
|
||||||
<port>9000</port>
|
|
||||||
</replica>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse3</host>
|
|
||||||
<port>9000</port>
|
|
||||||
</replica>
|
|
||||||
</shard>
|
|
||||||
</one_shard_cluster>
|
|
||||||
<sharded_cluster_secure>
|
|
||||||
<shard>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse1</host>
|
|
||||||
<port>9440</port>
|
|
||||||
<secure>1</secure>
|
|
||||||
</replica>
|
|
||||||
</shard>
|
|
||||||
<shard>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse2</host>
|
|
||||||
<port>9440</port>
|
|
||||||
<secure>1</secure>
|
|
||||||
</replica>
|
|
||||||
</shard>
|
|
||||||
<shard>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse3</host>
|
|
||||||
<port>9440</port>
|
|
||||||
<secure>1</secure>
|
|
||||||
</replica>
|
|
||||||
</shard>
|
|
||||||
</sharded_cluster_secure>
|
|
||||||
<sharded_cluster_secure_long_usernames>
|
|
||||||
<shard>
|
|
||||||
<internal_replication>true</internal_replication>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse1</host>
|
|
||||||
<port>9440</port>
|
|
||||||
<secure>1</secure>
|
|
||||||
<!-- i'm simulateing the problem here with long username, but it happens also when there are a lot of servers in cluster -->
|
|
||||||
<user>user_with_a_very_very_very_very_long_name_we_will_use_him_to_simulate_the_problem_with_inserting_to_distributed_when_folder_name_is_too_long_i_hope_that_length_is_enough_username_end</user>
|
|
||||||
<password></password>
|
|
||||||
</replica>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse2</host>
|
|
||||||
<port>9440</port>
|
|
||||||
<secure>1</secure>
|
|
||||||
<user>user_with_a_very_very_very_very_long_name_we_will_use_him_to_simulate_the_problem_with_inserting_to_distributed_when_folder_name_is_too_long_i_hope_that_length_is_enough_username_end</user>
|
|
||||||
<password></password>
|
|
||||||
</replica>
|
|
||||||
<replica>
|
|
||||||
<host>clickhouse3</host>
|
|
||||||
<port>9440</port>
|
|
||||||
<secure>1</secure>
|
|
||||||
<user>user_with_a_very_very_very_very_long_name_we_will_use_him_to_simulate_the_problem_with_inserting_to_distributed_when_folder_name_is_too_long_i_hope_that_length_is_enough_username_end</user>
|
|
||||||
<password></password>
|
|
||||||
</replica>
|
|
||||||
</shard>
|
|
||||||
</sharded_cluster_secure_long_usernames>
|
|
||||||
</remote_servers>
|
</remote_servers>
|
||||||
</yandex>
|
</yandex>
|
||||||
|
|||||||
@ -1,18 +0,0 @@
|
|||||||
<yandex>
|
|
||||||
<openSSL>
|
|
||||||
<server>
|
|
||||||
<certificateFile>/etc/clickhouse-server/ssl/server.crt</certificateFile>
|
|
||||||
<privateKeyFile>/etc/clickhouse-server/ssl/server.key</privateKeyFile>
|
|
||||||
<dhParamsFile>/etc/clickhouse-server/ssl/dhparam.pem</dhParamsFile>
|
|
||||||
<verificationMode>none</verificationMode>
|
|
||||||
<cacheSessions>true</cacheSessions>
|
|
||||||
</server>
|
|
||||||
<client>
|
|
||||||
<cacheSessions>true</cacheSessions>
|
|
||||||
<verificationMode>none</verificationMode>
|
|
||||||
<invalidCertificateHandler>
|
|
||||||
<name>AcceptCertificateHandler</name>
|
|
||||||
</invalidCertificateHandler>
|
|
||||||
</client>
|
|
||||||
</openSSL>
|
|
||||||
</yandex>
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
<yandex>
|
|
||||||
|
|
||||||
<storage_configuration>
|
|
||||||
<disks>
|
|
||||||
<default>
|
|
||||||
<keep_free_space_bytes>1024</keep_free_space_bytes>
|
|
||||||
</default>
|
|
||||||
</disks>
|
|
||||||
<policies>
|
|
||||||
<default>
|
|
||||||
<volumes>
|
|
||||||
<default>
|
|
||||||
<disk>default</disk>
|
|
||||||
</default>
|
|
||||||
</volumes>
|
|
||||||
</default>
|
|
||||||
</policies>
|
|
||||||
</storage_configuration>
|
|
||||||
|
|
||||||
</yandex>
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
-----BEGIN DH PARAMETERS-----
|
|
||||||
MIIBCAKCAQEAua92DDli13gJ+//ZXyGaggjIuidqB0crXfhUlsrBk9BV1hH3i7fR
|
|
||||||
XGP9rUdk2ubnB3k2ejBStL5oBrkHm9SzUFSQHqfDjLZjKoUpOEmuDc4cHvX1XTR5
|
|
||||||
Pr1vf5cd0yEncJWG5W4zyUB8k++SUdL2qaeslSs+f491HBLDYn/h8zCgRbBvxhxb
|
|
||||||
9qeho1xcbnWeqkN6Kc9bgGozA16P9NLuuLttNnOblkH+lMBf42BSne/TWt3AlGZf
|
|
||||||
slKmmZcySUhF8aKfJnLKbkBCFqOtFRh8zBA9a7g+BT/lSANATCDPaAk1YVih2EKb
|
|
||||||
dpc3briTDbRsiqg2JKMI7+VdULY9bh3EawIBAg==
|
|
||||||
-----END DH PARAMETERS-----
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
MIIC/TCCAeWgAwIBAgIJANjx1QSR77HBMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
|
|
||||||
BAMMCWxvY2FsaG9zdDAgFw0xODA3MzAxODE2MDhaGA8yMjkyMDUxNDE4MTYwOFow
|
|
||||||
FDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
|
|
||||||
CgKCAQEAs9uSo6lJG8o8pw0fbVGVu0tPOljSWcVSXH9uiJBwlZLQnhN4SFSFohfI
|
|
||||||
4K8U1tBDTnxPLUo/V1K9yzoLiRDGMkwVj6+4+hE2udS2ePTQv5oaMeJ9wrs+5c9T
|
|
||||||
4pOtlq3pLAdm04ZMB1nbrEysceVudHRkQbGHzHp6VG29Fw7Ga6YpqyHQihRmEkTU
|
|
||||||
7UCYNA+Vk7aDPdMS/khweyTpXYZimaK9f0ECU3/VOeG3fH6Sp2X6FN4tUj/aFXEj
|
|
||||||
sRmU5G2TlYiSIUMF2JPdhSihfk1hJVALrHPTU38SOL+GyyBRWdNcrIwVwbpvsvPg
|
|
||||||
pryMSNxnpr0AK0dFhjwnupIv5hJIOQIDAQABo1AwTjAdBgNVHQ4EFgQUjPLb3uYC
|
|
||||||
kcamyZHK4/EV8jAP0wQwHwYDVR0jBBgwFoAUjPLb3uYCkcamyZHK4/EV8jAP0wQw
|
|
||||||
DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAM/ocuDvfPus/KpMVD51j
|
|
||||||
4IdlU8R0vmnYLQ+ygzOAo7+hUWP5j0yvq4ILWNmQX6HNvUggCgFv9bjwDFhb/5Vr
|
|
||||||
85ieWfTd9+LTjrOzTw4avdGwpX9G+6jJJSSq15tw5ElOIFb/qNA9O4dBiu8vn03C
|
|
||||||
L/zRSXrARhSqTW5w/tZkUcSTT+M5h28+Lgn9ysx4Ff5vi44LJ1NnrbJbEAIYsAAD
|
|
||||||
+UA+4MBFKx1r6hHINULev8+lCfkpwIaeS8RL+op4fr6kQPxnULw8wT8gkuc8I4+L
|
|
||||||
P9gg/xDHB44T3ADGZ5Ib6O0DJaNiToO6rnoaaxs0KkotbvDWvRoxEytSbXKoYjYp
|
|
||||||
0g==
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
-----BEGIN PRIVATE KEY-----
|
|
||||||
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCz25KjqUkbyjyn
|
|
||||||
DR9tUZW7S086WNJZxVJcf26IkHCVktCeE3hIVIWiF8jgrxTW0ENOfE8tSj9XUr3L
|
|
||||||
OguJEMYyTBWPr7j6ETa51LZ49NC/mhox4n3Cuz7lz1Pik62WreksB2bThkwHWdus
|
|
||||||
TKxx5W50dGRBsYfMenpUbb0XDsZrpimrIdCKFGYSRNTtQJg0D5WTtoM90xL+SHB7
|
|
||||||
JOldhmKZor1/QQJTf9U54bd8fpKnZfoU3i1SP9oVcSOxGZTkbZOViJIhQwXYk92F
|
|
||||||
KKF+TWElUAusc9NTfxI4v4bLIFFZ01ysjBXBum+y8+CmvIxI3GemvQArR0WGPCe6
|
|
||||||
ki/mEkg5AgMBAAECggEATrbIBIxwDJOD2/BoUqWkDCY3dGevF8697vFuZKIiQ7PP
|
|
||||||
TX9j4vPq0DfsmDjHvAPFkTHiTQXzlroFik3LAp+uvhCCVzImmHq0IrwvZ9xtB43f
|
|
||||||
7Pkc5P6h1l3Ybo8HJ6zRIY3TuLtLxuPSuiOMTQSGRL0zq3SQ5DKuGwkz+kVjHXUN
|
|
||||||
MR2TECFwMHKQ5VLrC+7PMpsJYyOMlDAWhRfUalxC55xOXTpaN8TxNnwQ8K2ISVY5
|
|
||||||
212Jz/a4hn4LdwxSz3Tiu95PN072K87HLWx3EdT6vW4Ge5P/A3y+smIuNAlanMnu
|
|
||||||
plHBRtpATLiTxZt/n6npyrfQVbYjSH7KWhB8hBHtaQKBgQDh9Cq1c/KtqDtE0Ccr
|
|
||||||
/r9tZNTUwBE6VP+3OJeKdEdtsfuxjOCkS1oAjgBJiSDOiWPh1DdoDeVZjPKq6pIu
|
|
||||||
Mq12OE3Doa8znfCXGbkSzEKOb2unKZMJxzrz99kXt40W5DtrqKPNb24CNqTiY8Aa
|
|
||||||
CjtcX+3weat82VRXvph6U8ltMwKBgQDLxjiQQzNoY7qvg7CwJCjf9qq8jmLK766g
|
|
||||||
1FHXopqS+dTxDLM8eJSRrpmxGWJvNeNc1uPhsKsKgotqAMdBUQTf7rSTbt4MyoH5
|
|
||||||
bUcRLtr+0QTK9hDWMOOvleqNXha68vATkohWYfCueNsC60qD44o8RZAS6UNy3ENq
|
|
||||||
cM1cxqe84wKBgQDKkHutWnooJtajlTxY27O/nZKT/HA1bDgniMuKaz4R4Gr1PIez
|
|
||||||
on3YW3V0d0P7BP6PWRIm7bY79vkiMtLEKdiKUGWeyZdo3eHvhDb/3DCawtau8L2K
|
|
||||||
GZsHVp2//mS1Lfz7Qh8/L/NedqCQ+L4iWiPnZ3THjjwn3CoZ05ucpvrAMwKBgB54
|
|
||||||
nay039MUVq44Owub3KDg+dcIU62U+cAC/9oG7qZbxYPmKkc4oL7IJSNecGHA5SbU
|
|
||||||
2268RFdl/gLz6tfRjbEOuOHzCjFPdvAdbysanpTMHLNc6FefJ+zxtgk9sJh0C4Jh
|
|
||||||
vxFrw9nTKKzfEl12gQ1SOaEaUIO0fEBGbe8ZpauRAoGAMAlGV+2/K4ebvAJKOVTa
|
|
||||||
dKAzQ+TD2SJmeR1HZmKDYddNqwtZlzg3v4ZhCk4eaUmGeC1Bdh8MDuB3QQvXz4Dr
|
|
||||||
vOIP4UVaOr+uM+7TgAgVnP4/K6IeJGzUDhX93pmpWhODfdu/oojEKVcpCojmEmS1
|
|
||||||
KCBtmIrQLqzMpnBpLNuSY+Q=
|
|
||||||
-----END PRIVATE KEY-----
|
|
||||||
@ -10,7 +10,6 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d:/etc/clickhouse-server/config.d"
|
- "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d:/etc/clickhouse-server/config.d"
|
||||||
- "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.d:/etc/clickhouse-server/users.d"
|
- "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.d:/etc/clickhouse-server/users.d"
|
||||||
- "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/ssl:/etc/clickhouse-server/ssl"
|
|
||||||
- "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
|
- "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
|
||||||
- "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
|
- "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
|
||||||
- "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
|
- "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
|
||||||
|
|||||||
@ -7,7 +7,7 @@ append_path(sys.path, "..")
|
|||||||
|
|
||||||
from helpers.cluster import Cluster
|
from helpers.cluster import Cluster
|
||||||
from helpers.argparser import argparser
|
from helpers.argparser import argparser
|
||||||
from map_type.requirements import QA_SRS018_ClickHouse_Map_Data_Type
|
from map_type.requirements import SRS018_ClickHouse_Map_Data_Type
|
||||||
|
|
||||||
xfails = {
|
xfails = {
|
||||||
"tests/table map with key integer/Int:":
|
"tests/table map with key integer/Int:":
|
||||||
@ -39,7 +39,7 @@ xflags = {
|
|||||||
@XFlags(xflags)
|
@XFlags(xflags)
|
||||||
@Name("map type")
|
@Name("map type")
|
||||||
@Specifications(
|
@Specifications(
|
||||||
QA_SRS018_ClickHouse_Map_Data_Type
|
SRS018_ClickHouse_Map_Data_Type
|
||||||
)
|
)
|
||||||
def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
|
def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
|
||||||
"""Map type regression.
|
"""Map type regression.
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# These requirements were auto generated
|
# These requirements were auto generated
|
||||||
# from software requirements specification (SRS)
|
# from software requirements specification (SRS)
|
||||||
# document by TestFlows v1.6.210214.1233241.
|
# document by TestFlows v1.6.210223.1172503.
|
||||||
# Do not edit by hand but re-generate instead
|
# Do not edit by hand but re-generate instead
|
||||||
# using 'tfs requirements generate' command.
|
# using 'tfs requirements generate' command.
|
||||||
from testflows.core import Specification
|
from testflows.core import Specification
|
||||||
|
|||||||
@ -18,6 +18,7 @@ def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
|
|||||||
Feature(test=load("ldap.regression", "regression"))(**args)
|
Feature(test=load("ldap.regression", "regression"))(**args)
|
||||||
Feature(test=load("rbac.regression", "regression"))(**args)
|
Feature(test=load("rbac.regression", "regression"))(**args)
|
||||||
Feature(test=load("aes_encryption.regression", "regression"))(**args)
|
Feature(test=load("aes_encryption.regression", "regression"))(**args)
|
||||||
|
Feature(test=load("map_type.regression", "regression"))(**args)
|
||||||
|
|
||||||
if main():
|
if main():
|
||||||
regression()
|
regression()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user