From 9042ad40f2a56d6cfd4117897cbc9943253d4e09 Mon Sep 17 00:00:00 2001 From: Alexei Gradinari Date: Fri, 5 Aug 2016 16:34:15 -0400 Subject: app_voicemail: Add taskprocessor alert level options. On heavy loaded system with IMAP or DB storage, 'app_voicemail' taskprocessor queue could reach 500 scheduled tasks. It could happen when the IMAP or DB server dies or is unreachable. It could happen on startup when there are many (thousands) realtime endpoints configured with unsolicited mwi. If the taskprocessor queue reaches the high water level then the alert is triggered and pjsip stops processing new requests until the queue reaches the low water level to clear the alert. This patch adds 2 new 'general' configuration options to tune taskprocessor alert levels: 'tps_queue_high' - Taskprocessor high water alert trigger level. 'tps_queue_low' - Taskprocessor low water clear alert level ASTERISK-26229 #close Change-Id: I766294fbffedf64053c0d9ac0bedd3109f043ee8 --- apps/app_voicemail.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'apps/app_voicemail.c') diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 894038bdb..4727e2ee5 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -13532,6 +13532,8 @@ static int actual_load_config(int reload, struct ast_config *cfg, struct ast_con int x; unsigned int tmpadsi[4]; char secretfn[PATH_MAX] = ""; + long tps_queue_low; + long tps_queue_high; #ifdef IMAP_STORAGE ast_copy_string(imapparentfolder, "\0", sizeof(imapparentfolder)); @@ -14107,6 +14109,25 @@ static int actual_load_config(int reload, struct ast_config *cfg, struct ast_con pagerbody = ast_strdup(substitute_escapes(val)); } + tps_queue_high = AST_TASKPROCESSOR_HIGH_WATER_LEVEL; + if ((val = ast_variable_retrieve(cfg, "general", "tps_queue_high"))) { + if (sscanf(val, "%30ld", &tps_queue_high) != 1 || tps_queue_high <= 0) { + ast_log(AST_LOG_WARNING, "Invalid the taskprocessor high water alert trigger level '%s'\n", val); + tps_queue_high = AST_TASKPROCESSOR_HIGH_WATER_LEVEL; + } + } + tps_queue_low = -1; + if ((val = ast_variable_retrieve(cfg, "general", "tps_queue_low"))) { + if (sscanf(val, "%30ld", &tps_queue_low) != 1 || + tps_queue_low < -1 || tps_queue_high < tps_queue_low) { + ast_log(AST_LOG_WARNING, "Invalid the taskprocessor low water clear alert level '%s'\n", val); + tps_queue_low = -1; + } + } + if (ast_taskprocessor_alert_set_levels(mwi_subscription_tps, tps_queue_low, tps_queue_high)) { + ast_log(AST_LOG_WARNING, "Failed to set alert levels for voicemail taskprocessor.\n"); + } + /* load mailboxes from users.conf */ if (ucfg) { for (cat = ast_category_browse(ucfg, NULL); cat ; cat = ast_category_browse(ucfg, cat)) { -- cgit v1.2.3