Merge branch 'feature_multiple_disks' of github.com:ObjatieGroba/ClickHouse into feature_multiple_disks

This commit is contained in:
Igor Mineev 2019-05-21 14:11:11 +03:00
commit 756f991a2a
3 changed files with 23 additions and 23 deletions

View File

@ -2,6 +2,6 @@
<macros> <macros>
<cluster>test_cluster</cluster> <cluster>test_cluster</cluster>
<shard>0</shard> <shard>0</shard>
<replica>ch2</replica> <replica>ch1</replica>
</macros> </macros>
</yandex> </yandex>

View File

@ -24,7 +24,7 @@
<default> <default>
<volume> <volume>
<disk>jbod1</disk> <disk>jbod1</disk>
<max_data_part_size_bytes>1000000</max_data_part_size_bytes> <max_data_part_size_bytes>10000000</max_data_part_size_bytes>
<!-- Q: how it will behave if the only disk has max_data_part_size_bytes limitation? --> <!-- Q: how it will behave if the only disk has max_data_part_size_bytes limitation? -->
</volume> </volume>
</default> </default>
@ -34,11 +34,11 @@
<volume> <volume>
<!-- names for the volumes should be added to allow moving parts between volumed with DDL commands --> <!-- names for the volumes should be added to allow moving parts between volumed with DDL commands -->
<disk>default</disk> <disk>default</disk>
<max_data_part_size_bytes>1000000</max_data_part_size_bytes> <max_data_part_size_bytes>10000000</max_data_part_size_bytes>
</volume> </volume>
<volume> <volume>
<disk>external</disk> <disk>external</disk>
<max_data_part_size_bytes>10000000</max_data_part_size_bytes> <max_data_part_size_bytes>100000000</max_data_part_size_bytes>
</volume> </volume>
</default_disk_with_external> </default_disk_with_external>