mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 00:30:49 +00:00
Fix checks
This commit is contained in:
parent
9685f9a8b7
commit
e81f85a79e
@ -17,25 +17,7 @@ ln -s /usr/share/clickhouse-test/clickhouse-test /usr/bin/clickhouse-test
|
||||
# install test configs
|
||||
/usr/share/clickhouse-test/config/install.sh
|
||||
|
||||
ARM="arm64"
|
||||
if [[ "$(uname -m)" == "$ARM" ]]; then
|
||||
cat <<EOF > /etc/clickhouse-server/config.d/erase_azure.xml
|
||||
<clickhouse>
|
||||
<storage_configuration>
|
||||
<disks>
|
||||
<azure remove="remove"/>
|
||||
<azure_cache remove="remove"/>
|
||||
</disks>
|
||||
<policies>
|
||||
<azure_cache remove="remove"/>
|
||||
<policies>
|
||||
</storage_configuration>
|
||||
</clickhouse>
|
||||
EOF
|
||||
else
|
||||
azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
|
||||
fi
|
||||
|
||||
azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
|
||||
./setup_minio.sh stateful
|
||||
|
||||
function start()
|
||||
|
@ -18,24 +18,7 @@ ln -s /usr/share/clickhouse-test/clickhouse-test /usr/bin/clickhouse-test
|
||||
# install test configs
|
||||
/usr/share/clickhouse-test/config/install.sh
|
||||
|
||||
ARM="arm64"
|
||||
if [[ "$(uname -m)" == "$ARM" ]]; then
|
||||
cat <<EOF > /etc/clickhouse-server/config.d/erase_azure.xml
|
||||
<clickhouse>
|
||||
<storage_configuration>
|
||||
<disks>
|
||||
<azure remove="remove"/>
|
||||
<azure_cache remove="remove"/>
|
||||
</disks>
|
||||
<policies>
|
||||
<azure_cache remove="remove"/>
|
||||
<policies>
|
||||
</storage_configuration>
|
||||
</clickhouse>
|
||||
EOF
|
||||
else
|
||||
azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
|
||||
fi
|
||||
azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
|
||||
|
||||
./setup_minio.sh stateless
|
||||
./setup_hdfs_minicluster.sh
|
||||
|
32
tests/config/config.d/azure_storage_conf.xml
Normal file
32
tests/config/config.d/azure_storage_conf.xml
Normal file
@ -0,0 +1,32 @@
|
||||
<clickhouse>
|
||||
<storage_configuration>
|
||||
<disks>
|
||||
<azure>
|
||||
<type>azure_blob_storage</type>
|
||||
<storage_account_url>http://localhost:10000/devstoreaccount1</storage_account_url>
|
||||
<container_name>cont</container_name>
|
||||
<skip_access_check>false</skip_access_check>
|
||||
<!-- default credentials for Azurite storage account -->
|
||||
<account_name>devstoreaccount1</account_name>
|
||||
<account_key>Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==</account_key>
|
||||
<max_single_part_upload_size>33554432</max_single_part_upload_size>
|
||||
</azure>
|
||||
<cached_azure>
|
||||
<type>cache</type>
|
||||
<disk>azure</disk>
|
||||
<path>azure_cache/</path>
|
||||
<max_size>100000000000</max_size>
|
||||
<cache_on_write_operations>1</cache_on_write_operations>
|
||||
</cached_azure>
|
||||
</disks>
|
||||
<policies>
|
||||
<azure_cache>
|
||||
<volumes>
|
||||
<main>
|
||||
<disk>cached_azure</disk>
|
||||
</main>
|
||||
</volumes>
|
||||
</azure_cache>
|
||||
</policies>
|
||||
</storage_configuration>
|
||||
</clickhouse>
|
@ -74,23 +74,6 @@
|
||||
<path>s3_cache_5/</path>
|
||||
<max_size>22548578304</max_size>
|
||||
</s3_cache_5>
|
||||
<azure>
|
||||
<type>azure_blob_storage</type>
|
||||
<storage_account_url>http://localhost:10000/devstoreaccount1</storage_account_url>
|
||||
<container_name>cont</container_name>
|
||||
<skip_access_check>false</skip_access_check>
|
||||
<!-- default credentials for Azurite storage account -->
|
||||
<account_name>devstoreaccount1</account_name>
|
||||
<account_key>Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==</account_key>
|
||||
<max_single_part_upload_size>33554432</max_single_part_upload_size>
|
||||
</azure>
|
||||
<cached_azure>
|
||||
<type>cache</type>
|
||||
<disk>azure</disk>
|
||||
<path>azure_cache/</path>
|
||||
<max_size>100000000000</max_size>
|
||||
<cache_on_write_operations>1</cache_on_write_operations>
|
||||
</cached_azure>
|
||||
<!-- local disks -->
|
||||
<local_disk>
|
||||
<type>local</type>
|
||||
@ -197,13 +180,6 @@
|
||||
</main>
|
||||
</volumes>
|
||||
</local_cache_3>
|
||||
<azure_cache>
|
||||
<volumes>
|
||||
<main>
|
||||
<disk>cached_azure</disk>
|
||||
</main>
|
||||
</volumes>
|
||||
</azure_cache>
|
||||
</policies>
|
||||
</storage_configuration>
|
||||
</clickhouse>
|
||||
|
@ -98,7 +98,12 @@ if [[ -n "$USE_S3_STORAGE_FOR_MERGE_TREE" ]] && [[ "$USE_S3_STORAGE_FOR_MERGE_TR
|
||||
ln -sf $SRC_PATH/config.d/logger_trace.xml $DEST_SERVER_PATH/config.d/
|
||||
fi
|
||||
|
||||
ARM="arm64"
|
||||
if [[ -n "$EXPORT_S3_STORAGE_POLICIES" ]]; then
|
||||
if [[ "$(uname -m)" == "$ARM" ]]; then
|
||||
ln -sf $SRC_PATH/config.d/azure_storage_conf.xml $DEST_SERVER_PATH/config.d/
|
||||
fi
|
||||
|
||||
ln -sf $SRC_PATH/config.d/storage_conf.xml $DEST_SERVER_PATH/config.d/
|
||||
ln -sf $SRC_PATH/users.d/s3_cache.xml $DEST_SERVER_PATH/users.d/
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user