thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 08:02:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed backup setting "read_from_filesystem_cache_if_exists_otherwise_bypass_cache" -> "read_from_filesystem_cache".

Browse Source
This commit is contained in:
Vitaly Baranov 2023-07-23 13:00:17 +02:00
parent 1cd7902079
commit 556ecf5c1c
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Backups/BackupSettings.cpp
View File

@ -27,7 +27,7 @@ namespace ErrorCodes
M(Bool, decrypt_files_from_encrypted_disks) \
M(Bool, deduplicate_files) \
M(Bool, allow_s3_native_copy) \
M(Bool, read_from_filesystem_cache_if_exists_otherwise_bypass_cache) \
M(Bool, read_from_filesystem_cache) \
M(UInt64, shard_num) \
M(UInt64, replica_num) \
M(Bool, internal) \

2
src/Backups/BackupSettings.h
View File

@ -46,7 +46,7 @@ struct BackupSettings
/// Allow to use the filesystem cache in passive mode - benefit from the existing cache entries,
/// but don't put more entries into the cache.
bool read_from_filesystem_cache_if_exists_otherwise_bypass_cache = true;
bool read_from_filesystem_cache = true;
/// 1-based shard index to store in the backup. 0 means all shards.
/// Can only be used with BACKUP ON CLUSTER.

4
src/Backups/BackupsWorker.cpp
View File

@ -186,8 +186,8 @@ namespace
auto read_settings = context->getReadSettings();
read_settings.remote_throttler = context->getBackupsThrottler();
read_settings.local_throttler = context->getBackupsThrottler();
read_settings.enable_filesystem_cache = backup_settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache;
read_settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = backup_settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache;
read_settings.enable_filesystem_cache = backup_settings.read_from_filesystem_cache;
read_settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = backup_settings.read_from_filesystem_cache;
return read_settings;
}

8
tests/integration/test_backup_restore_s3/test.py
View File

@ -352,9 +352,7 @@ def test_backup_with_fs_cache(
}
backup_settings = {
"read_from_filesystem_cache_if_exists_otherwise_bypass_cache": int(
allow_backup_read_cache
),
"read_from_filesystem_cache": int(allow_backup_read_cache),
"allow_s3_native_copy": int(allow_s3_native_copy),
}
@ -370,8 +368,8 @@ def test_backup_with_fs_cache(
restore_settings=restore_settings,
)
#print(f"backup_events = {backup_events}")
#print(f"restore_events = {restore_events}")
# print(f"backup_events = {backup_events}")
# print(f"restore_events = {restore_events}")
# BACKUP never updates the filesystem cache but it may read it if `read_from_filesystem_cache_if_exists_otherwise_bypass_cache` allows that.
if allow_backup_read_cache and in_cache_initially: