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

Merge pull request #21662 from kitaisreal/executable-pool-fix-default-max-execution-time-setting

Browse Source 
ExecutablePool fix default max execution time setting
This commit is contained in:
Maksim Kita 2021-03-12 20:58:56 +03:00 committed by GitHub
commit 49f6fd0923
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Dictionaries/ExecutablePoolDictionarySource.cpp
View File

@ -221,7 +221,9 @@ BlockInputStreamPtr ExecutablePoolDictionarySource::getStreamForBlock(const Bloc
}, configuration.max_command_execution_time * 10000); }, configuration.max_command_execution_time * 10000);
if (!result) if (!result)
throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Could not get process from pool, max command execution timeout exceeded"); throw Exception(ErrorCodes::TIMEOUT_EXCEEDED,
"Could not get process from pool, max command execution timeout exceeded ({}) seconds",
configuration.max_command_execution_time);
size_t rows_to_read = block.rows(); size_t rows_to_read = block.rows();
auto read_stream = context.getInputFormat(configuration.format, process->out, sample_block, rows_to_read); auto read_stream = context.getInputFormat(configuration.format, process->out, sample_block, rows_to_read);
@ -298,7 +300,7 @@ void registerDictionarySourceExecutablePool(DictionarySourceFactory & factory)
size_t max_command_execution_time = config.getUInt64(configuration_config_prefix + ".max_command_execution_time", 10); size_t max_command_execution_time = config.getUInt64(configuration_config_prefix + ".max_command_execution_time", 10);
size_t max_execution_time_seconds = static_cast<size_t>(context.getSettings().max_execution_time.totalSeconds()); size_t max_execution_time_seconds = static_cast<size_t>(context.getSettings().max_execution_time.totalSeconds());
if (max_command_execution_time > max_execution_time_seconds) if (max_execution_time_seconds != 0 && max_command_execution_time > max_execution_time_seconds)
max_command_execution_time = max_execution_time_seconds; max_command_execution_time = max_execution_time_seconds;
ExecutablePoolDictionarySource::Configuration configuration ExecutablePoolDictionarySource::Configuration configuration