diff options
| author | Stefan Giehl <stefan@matomo.org> | 2020-12-31 10:22:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-31 10:22:17 +0300 |
| commit | 94dc631979a95a14fa5b56dc9b184cee6fb2cff1 (patch) | |
| tree | 002b95f22bd4c95f345f7cc23f19d35aa2b3f8ff /config | |
| parent | 95db75a3de6a89199c0f1d37867d247716a39b88 (diff) | |
Limit max execution time of archiving queries to 2 hours by default (#16971)
* Limit max execution time of archiving queries to 2 hours
* Adds test for max execution time
* cast config value to float
* updates expected UI files
* update screenshots
Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>
Diffstat (limited to 'config')
| -rwxr-xr-x | config/global.ini.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index 461a4abddd..010d2cf764 100755 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -356,6 +356,11 @@ archiving_range_force_on_browser_request = 1 ; If you need any other period, or want to ensure one of those is always archived, you can define them here archiving_custom_ranges[] = +; If configured, archiving queries will be aborted after the configured amount of seconds. Set it to -1 if the query time +; should not be limited. Note: This feature requires a recent MySQL version (5.7 or newer). Some MySQL forks like MariaDB +; might not support this feature which uses the MAX_EXECUTION_TIME hint. +archiving_query_max_execution_time = 7200 + ; By default Matomo runs OPTIMIZE TABLE SQL queries to free spaces after deleting some data. ; If your Matomo tracks millions of pages, the OPTIMIZE TABLE queries might run for hours (seen in "SHOW FULL PROCESSLIST \g") ; so you can disable these special queries here: |