thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed parameters

Browse Source
This commit is contained in:
Smita Kulkarni 2023-12-23 11:40:58 +01:00
parent 6dfb1c25ec
commit 3e22f29b45
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en/operations/backup.md
View File

@ -463,7 +463,7 @@ To write backups to an AzureBlobStorage container you need the following pieces
The destination for a backup will be specified like this:
```
AzureBlobStorage('<connection string>/<url>', '<Container>', '<Path>', '<Account Name>', '<Account Key>)
AzureBlobStorage('<connection string>/<url>', '<container>', '<path>', '<account name>', '<account key>')
```
```sql

25
src/Backups/registerBackupEngineAzureBlobStorage.cpp
View File

@ -22,6 +22,7 @@ namespace ErrorCodes
{
extern const int BAD_ARGUMENTS;
extern const int SUPPORT_IS_DISABLED;
extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
}
#if USE_AZURE_BLOB_STORAGE
@ -54,20 +55,34 @@ void registerBackupEngineAzureBlobStorage(BackupFactory & factory)
StorageAzureBlob::Configuration configuration;
if (args.size() == 4)
if (args.size() == 3)
{
configuration.connection_url = args[0].safeGet<String>();
configuration.is_connection_string = true;
configuration.container = args[1].safeGet<String>();
configuration.blob_path = args[2].safeGet<String>();
configuration.format = args[3].safeGet<String>();
LOG_TRACE(&Poco::Logger::get("registerBackupEngineAzureBlobStorage"), "configuration.connection_url = {}"
"configuration.container = {}"
"configuration.blob_path = {}"
"configuration.format = {}",
configuration.connection_url, configuration.container, configuration.blob_path, configuration.format);
"configuration.blob_path = {}",
configuration.connection_url, configuration.container, configuration.blob_path);
}
else if (args.size() == 5)
{
configuration.connection_url = args[0].safeGet<String>();
configuration.is_connection_string = false;
configuration.container = args[1].safeGet<String>();
configuration.blob_path = args[2].safeGet<String>();
configuration.account_name = args[3].safeGet<String>();
configuration.account_key = args[4].safeGet<String>();
}
else
{
throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
"Backup AzureBlobStorage requires 3 or 5 arguments: connection string>/<url, container, path, [account name], [account key]");
}

2
tests/integration/test_backup_restore_azure_blob_storage/test.py
View File

@ -147,7 +147,7 @@ def test_backup_restore(cluster):
print(get_azure_file_content("test_simple_write_c.csv", port))
assert get_azure_file_content("test_simple_write_c.csv", port) == '1,"a"\n'
backup_destination = f"AzureBlobStorage('{cluster.env_variables['AZURITE_CONNECTION_STRING']}', 'cont', 'test_simple_write_c_backup.csv', 'CSV')"
backup_destination = f"AzureBlobStorage('{cluster.env_variables['AZURITE_CONNECTION_STRING']}', 'cont', 'test_simple_write_c_backup.csv')"
azure_query(
node,
f"BACKUP TABLE test_simple_write_connection_string TO {backup_destination}",