diff --git a/clickhouse/config_update_scripts/update_compose.py b/clickhouse/config_update_scripts/update_compose.py index 5e677e2..66440e2 100644 --- a/clickhouse/config_update_scripts/update_compose.py +++ b/clickhouse/config_update_scripts/update_compose.py @@ -92,7 +92,7 @@ if __name__ == "__main__": with open(f'../node{curr_num_servers + i}-config/config.xml','w') as f1: f1.write(config_content) - macros_content = macros_template.render(shard_num="0{curr_num_shards}",replica_num=i) + macros_content = macros_template.render(shard_num="0"+str(int(curr_num_shards+1)),replica_num=i) with open(f'../node{curr_num_servers + i}-config/macros.xml','w') as f2: f2.write(macros_content) diff --git a/clickhouse/docker-compose.yaml b/clickhouse/docker-compose.yaml index 79848ce..f7c95bc 100644 --- a/clickhouse/docker-compose.yaml +++ b/clickhouse/docker-compose.yaml @@ -2,8 +2,7 @@ services: clickhouse-keeper1: image: clickhouse/clickhouse-server:latest container_name: clickhouse-keeper1 - command: > - /usr/bin/clickhouse-keeper --config-file=/etc/clickhouse-server/config.xml + command: /usr/bin/clickhouse-keeper --config-file=/etc/clickhouse-server/config.xml volumes: - ./clickhouse_keeper/keeper1-config.xml:/etc/clickhouse-server/config.xml - clickhouse_keeper1_data:/var/lib/clickhouse @@ -16,8 +15,7 @@ services: clickhouse-keeper2: image: clickhouse/clickhouse-server:latest container_name: clickhouse-keeper2 - command: > - /usr/bin/clickhouse-keeper --config-file=/etc/clickhouse-server/config.xml + command: /usr/bin/clickhouse-keeper --config-file=/etc/clickhouse-server/config.xml volumes: - ./clickhouse_keeper/keeper2-config.xml:/etc/clickhouse-server/config.xml - clickhouse_keeper2_data:/var/lib/clickhouse @@ -29,8 +27,7 @@ services: clickhouse-keeper3: image: clickhouse/clickhouse-server:latest container_name: clickhouse-keeper3 - command: > - /usr/bin/clickhouse-keeper --config-file=/etc/clickhouse-server/config.xml + command: /usr/bin/clickhouse-keeper --config-file=/etc/clickhouse-server/config.xml volumes: - ./clickhouse_keeper/keeper3-config.xml:/etc/clickhouse-server/config.xml - clickhouse_keeper3_data:/var/lib/clickhouse diff --git a/clickhouse/jinja-templates/storage-policy.xml.jinja b/clickhouse/jinja-templates/storage-policy.xml.jinja index 8f8653c..440d7e7 100644 --- a/clickhouse/jinja-templates/storage-policy.xml.jinja +++ b/clickhouse/jinja-templates/storage-policy.xml.jinja @@ -1,11 +1,11 @@ - ../clickhouse_data{{server_num}}/hot + /clickhouse_data{{server_num}}/hot 300000000 - ../clickhouse_data{{server_num}}/cold + /clickhouse_data{{server_num}}/cold 500000000