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

dbms/tests/integration_drafts/001_miltiple_disks/config/ch1.metrika.xml

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

dbms/tests/integration_drafts/001_miltiple_disks/config/conf.d/storage_config.xml

@@ -4,46 +4,46 @@
     <disks>
         <default> <!-- path for deafult disk is provided in main config -->
             <keep_free_space_bytes>0</keep_free_space_bytes>
-        </default>    
+        </default>
         <jbod1>
             <path>/jbod1/</path> <!-- trailing slash is mandatory -->
             <keep_free_space_bytes>1000000</keep_free_space_bytes>
-        </jbod1>    
+        </jbod1>
         <jbod2>
             <path>/jbod2/</path>
             <keep_free_space_bytes>1000000</keep_free_space_bytes>
-        </jbod2>       
+        </jbod2>
         <external>
             <path>/external/</path>
             <keep_free_space_bytes>1000000</keep_free_space_bytes>
-        </external>       
+        </external>
     </disks>
 
     <schemas>
         <!-- default: store on jbod1-->
         <default>
-            <volume> 
+            <volume>
                 <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? -->
             </volume>
         </default>
 
         <!-- store local by default, store big parts on external -->
-        <default_disk_with_external> 
-            <volume> 
+        <default_disk_with_external>
+            <volume>
                 <!-- names for the volumes should be added to allow moving parts between volumed with DDL commands -->
                 <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>
                 <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>
         </default_disk_with_external>
 
         <!-- store on JBOD by default (round-robin), store bif parts on external -->
-        <jbod_with_external> 
+        <jbod_with_external>
             <volume>
                 <disk>jbod1</disk>
                 <disk>jbod2</disk>

dbms/tests/integration_drafts/001_miltiple_disks/docker-compose.yml

@@ -4,7 +4,7 @@ services:
   zookeeper:
     image: zookeeper
     networks:
-      - 001_miltiple_disks      
+      - 001_miltiple_disks
 
   ch1:
     image: yandex/clickhouse-server
@@ -12,16 +12,16 @@ services:
     depends_on:
       - "zookeeper"
     networks:
-      - 001_miltiple_disks 
+      - 001_miltiple_disks
     tmpfs:
       - /jbod1:size=40M
       - /jbod2:size=40M
       - /external:size=200M
     volumes:
-      - ./config/conf.d:/etc/clickhouse-server/conf.d    
-      - ./config/ch1.metrika.xml:/etc/metrika.xml    
+      - ./config/conf.d:/etc/clickhouse-server/conf.d
+      - ./config/ch1.metrika.xml:/etc/metrika.xml
       # TODO: hacky, but "cheap" - don't need to rebuild docker image.
-      # for CI & tests automation should be done another way, not relying on build path 
+      # for CI & tests automation should be done another way, not relying on build path
       - ../../../../build/dbms/programs/clickhouse:/usr/bin/clickhouse
       - ./test_setup:/test_setup
     entrypoint: ['/test_setup/entrypoint.sh']
@@ -33,20 +33,20 @@ services:
     depends_on:
       - "zookeeper"
     networks:
-      - 001_miltiple_disks 
+      - 001_miltiple_disks
     tmpfs:
       - /jbod1:size=40M
       - /jbod2:size=40M
       - /external:size=200M
     volumes:
-      - ./config/conf.d:/etc/clickhouse-server/conf.d    
-      - ./config/ch2.metrika.xml:/etc/metrika.xml    
+      - ./config/conf.d:/etc/clickhouse-server/conf.d
+      - ./config/ch2.metrika.xml:/etc/metrika.xml
       # TODO: hacky, but "cheap" - don't need to rebuild docker image.
-      # for CI & tests automation should be done another way, not relying on build path 
+      # for CI & tests automation should be done another way, not relying on build path
       - ../../../../build/dbms/programs/clickhouse:/usr/bin/clickhouse
       - ./test_setup:/test_setup
     entrypoint: ['/test_setup/entrypoint.sh']
-    
+
 
 networks:
-  001_miltiple_disks:      
+  001_miltiple_disks: