From 5701778da22ff679c9f1895a10f02f6b9ab6a52c Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Wed, 1 Apr 2026 17:19:31 -0400 Subject: [PATCH 1/5] MM-67505 Add AnalyticsQueryTimeout setting and use when refreshing materialized views --- .../environment-configuration-settings.rst | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/source/administration-guide/configure/environment-configuration-settings.rst b/source/administration-guide/configure/environment-configuration-settings.rst index 23d5eb3ff6e..ce4d10cf571 100644 --- a/source/administration-guide/configure/environment-configuration-settings.rst +++ b/source/administration-guide/configure/environment-configuration-settings.rst @@ -841,6 +841,24 @@ Query timeout | Numerical input in seconds. Default is **30** seconds. | | +--------------------------------------------------------+-------------------------------------------------------------------------+ +.. config:setting:: analytics-query-timeout + :displayname: Analytics Query timeout (Database) + :systemconsole: Environment > Database + :configjson: .SqlSettings.AnalyticsQueryTimeout + :environment: MM_SQLSETTINGS_ANALYTICSQUERYTIMEOUT + :description: The number of seconds to wait for a response from the database after opening a connection and sending certain analytics queries. This setting only applies to long queries which are run in the background to populate some information in the Team and Site Statistics pages. Default is **300** seconds. + +Analytics query timeout +~~~~~~~~~~~~~ + ++--------------------------------------------------------------------------------------------+-------------------------------------------------------------------------+ +| The number of seconds to wait for a response from the database after opening a connection | - ``config.json`` setting: ``SqlSettings`` > ``QueryTimeout`` > ``30`` | +| and sending certain analytics queries. This setting only applies to long queries which are | - System Config path: **Environment > Database** | +| run in the background to populate some information in the Team and Site Statistics pages. | - Environment variable: ``MM_SQLSETTINGS_QUERYTIMEOUT`` | +| | | +| Numerical input in seconds. Default is **300** seconds. | | ++--------------------------------------------------------------------------------------------+-------------------------------------------------------------------------+ + .. config:setting:: maximum-connection-lifetime :displayname: Maximum connection lifetime (Database) :systemconsole: Environment > Database From f0873893bd07f7c7bdda1a4683ed595395f2b5a1 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Thu, 2 Apr 2026 11:26:42 -0400 Subject: [PATCH 2/5] Update environment-configuration-settings.rst --- .../configure/environment-configuration-settings.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/administration-guide/configure/environment-configuration-settings.rst b/source/administration-guide/configure/environment-configuration-settings.rst index ce4d10cf571..e2b3c09f126 100644 --- a/source/administration-guide/configure/environment-configuration-settings.rst +++ b/source/administration-guide/configure/environment-configuration-settings.rst @@ -849,12 +849,12 @@ Query timeout :description: The number of seconds to wait for a response from the database after opening a connection and sending certain analytics queries. This setting only applies to long queries which are run in the background to populate some information in the Team and Site Statistics pages. Default is **300** seconds. Analytics query timeout -~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~ +--------------------------------------------------------------------------------------------+-------------------------------------------------------------------------+ | The number of seconds to wait for a response from the database after opening a connection | - ``config.json`` setting: ``SqlSettings`` > ``QueryTimeout`` > ``30`` | | and sending certain analytics queries. This setting only applies to long queries which are | - System Config path: **Environment > Database** | -| run in the background to populate some information in the Team and Site Statistics pages. | - Environment variable: ``MM_SQLSETTINGS_QUERYTIMEOUT`` | +| run in the background to populate some information in the Team and Site Statistics pages. | - Environment variable: ``MM_SQLSETTINGS_ANALYTICSQUERYTIMEOUT`` | | | | | Numerical input in seconds. Default is **300** seconds. | | +--------------------------------------------------------------------------------------------+-------------------------------------------------------------------------+ From dd7700fad5f66f94069a4024a098b1dc83dc5bcf Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Thu, 2 Apr 2026 19:27:18 -0400 Subject: [PATCH 3/5] Fix another field name --- .../environment-configuration-settings.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/administration-guide/configure/environment-configuration-settings.rst b/source/administration-guide/configure/environment-configuration-settings.rst index e2b3c09f126..d033e4e0793 100644 --- a/source/administration-guide/configure/environment-configuration-settings.rst +++ b/source/administration-guide/configure/environment-configuration-settings.rst @@ -833,13 +833,13 @@ Maximum idle connections Query timeout ~~~~~~~~~~~~~ -+--------------------------------------------------------+-------------------------------------------------------------------------+ -| The amount of time to wait, in seconds, for a response | - System Config path: **Environment > Database** | -| from the database after opening a connection and | - ``config.json`` setting: ``SqlSettings`` > ``QueryTimeout`` > ``30`` | -| sending the query. | - Environment variable: ``MM_SQLSETTINGS_QUERYTIMEOUT`` | -| | | -| Numerical input in seconds. Default is **30** seconds. | | -+--------------------------------------------------------+-------------------------------------------------------------------------+ ++--------------------------------------------------------+----------------------------------------------------------------------------------+ +| The amount of time to wait, in seconds, for a response | - System Config path: **Environment > Database** | +| from the database after opening a connection and | - ``config.json`` setting: ``SqlSettings`` > ``AnalyticsQueryTimeout`` > ``30`` | +| sending the query. | - Environment variable: ``MM_SQLSETTINGS_QUERYTIMEOUT`` | +| | | +| Numerical input in seconds. Default is **30** seconds. | | ++--------------------------------------------------------+----------------------------------------------------------------------------------+ .. config:setting:: analytics-query-timeout :displayname: Analytics Query timeout (Database) From 1e08e01972d9f25f997fb1867926df181f2205f0 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Thu, 2 Apr 2026 19:49:19 -0400 Subject: [PATCH 4/5] This'll be correct eventually --- .../environment-configuration-settings.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/administration-guide/configure/environment-configuration-settings.rst b/source/administration-guide/configure/environment-configuration-settings.rst index d033e4e0793..b71e7da99ca 100644 --- a/source/administration-guide/configure/environment-configuration-settings.rst +++ b/source/administration-guide/configure/environment-configuration-settings.rst @@ -835,7 +835,7 @@ Query timeout +--------------------------------------------------------+----------------------------------------------------------------------------------+ | The amount of time to wait, in seconds, for a response | - System Config path: **Environment > Database** | -| from the database after opening a connection and | - ``config.json`` setting: ``SqlSettings`` > ``AnalyticsQueryTimeout`` > ``30`` | +| from the database after opening a connection and | - ``config.json`` setting: ``SqlSettings`` > ``QueryTimeout`` > ``30`` | | sending the query. | - Environment variable: ``MM_SQLSETTINGS_QUERYTIMEOUT`` | | | | | Numerical input in seconds. Default is **30** seconds. | | @@ -851,13 +851,13 @@ Query timeout Analytics query timeout ~~~~~~~~~~~~~~~~~~~~~~~ -+--------------------------------------------------------------------------------------------+-------------------------------------------------------------------------+ -| The number of seconds to wait for a response from the database after opening a connection | - ``config.json`` setting: ``SqlSettings`` > ``QueryTimeout`` > ``30`` | -| and sending certain analytics queries. This setting only applies to long queries which are | - System Config path: **Environment > Database** | -| run in the background to populate some information in the Team and Site Statistics pages. | - Environment variable: ``MM_SQLSETTINGS_ANALYTICSQUERYTIMEOUT`` | -| | | -| Numerical input in seconds. Default is **300** seconds. | | -+--------------------------------------------------------------------------------------------+-------------------------------------------------------------------------+ ++--------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------+ +| The number of seconds to wait for a response from the database after opening a connection | - ``config.json`` setting: ``SqlSettings`` > ``AnalyticsQueryTimeout`` > ``30`` | +| and sending certain analytics queries. This setting only applies to long queries which are | - System Config path: **Environment > Database** | +| run in the background to populate some information in the Team and Site Statistics pages. | - Environment variable: ``MM_SQLSETTINGS_ANALYTICSQUERYTIMEOUT`` | +| | | +| Numerical input in seconds. Default is **300** seconds. | | ++--------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------+ .. config:setting:: maximum-connection-lifetime :displayname: Maximum connection lifetime (Database) From bbf2f97d5a0e4bb35e82d8185649e88279b19299 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 7 Apr 2026 10:26:17 -0400 Subject: [PATCH 5/5] Fix default --- .../configure/environment-configuration-settings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/administration-guide/configure/environment-configuration-settings.rst b/source/administration-guide/configure/environment-configuration-settings.rst index b71e7da99ca..bf07bba2edb 100644 --- a/source/administration-guide/configure/environment-configuration-settings.rst +++ b/source/administration-guide/configure/environment-configuration-settings.rst @@ -852,7 +852,7 @@ Analytics query timeout ~~~~~~~~~~~~~~~~~~~~~~~ +--------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------+ -| The number of seconds to wait for a response from the database after opening a connection | - ``config.json`` setting: ``SqlSettings`` > ``AnalyticsQueryTimeout`` > ``30`` | +| The number of seconds to wait for a response from the database after opening a connection | - ``config.json`` setting: ``SqlSettings`` > ``AnalyticsQueryTimeout`` > ``300`` | | and sending certain analytics queries. This setting only applies to long queries which are | - System Config path: **Environment > Database** | | run in the background to populate some information in the Team and Site Statistics pages. | - Environment variable: ``MM_SQLSETTINGS_ANALYTICSQUERYTIMEOUT`` | | | |