From e21deabf02e2d3e4bfe2c29fbc131684e70cb834 Mon Sep 17 00:00:00 2001
From: David Vossel <dvossel@digium.com>
Date: Fri, 4 Dec 2009 18:48:31 +0000
Subject: [PATCH] new queue option, penaltymemberslimit, disregards penalty on
too few queue members when enabled
(closes issue #14559)
Reported by: fiddur
Patches:
trunk-199584-1.diff uploaded by fiddur (license 678)
Tested by: fiddur, dvossel
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@233196 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_queue.c | 30 ++++++++++++++++++++++--------
configs/queues.conf.sample | 6 ++++++
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 5b0187e126..7316a9b700 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -954,6 +954,7 @@ struct call_queue {
int count; /*!< How many entries */
int maxlen; /*!< Max number of entries */
int wrapuptime; /*!< Wrapup Time */
+ int penaltymemberslimit; /*!< Disregard penalty when queue has fewer than this many members */
int retry; /*!< Retry calling everyone after this amount of time */
int timeout; /*!< How long to wait for an answer */
@@ -1447,6 +1448,7 @@ static void init_queue(struct call_queue *q)
q->monfmt[0] = '\0';
q->reportholdtime = 0;
q->wrapuptime = 0;
+ q->penaltymemberslimit = 0;
q->joinempty = 0;
q->leavewhenempty = 0;
q->memberdelay = 0;
@@ -1752,6 +1754,8 @@ static void queue_set_param(struct call_queue *q, const char *param, const char
q->retry = DEFAULT_RETRY;
} else if (!strcasecmp(param, "wrapuptime")) {
q->wrapuptime = atoi(val);
+ } else if (!strcasecmp(param, "penaltymemberslimit")) {
+ q->penaltymemberslimit = atoi(val);
} else if (!strcasecmp(param, "autofill")) {
q->autofill = ast_true(val);
} else if (!strcasecmp(param, "monitor-type")) {
@@ -3691,13 +3695,23 @@ static int update_queue(struct call_queue *q, struct member *member, int callcom
*/
static int calc_metric(struct call_queue *q, struct member *mem, int pos, struct queue_ent *qe, struct callattempt *tmp)
{
- if ((qe->max_penalty && (mem->penalty > qe->max_penalty)) || (qe->min_penalty && (mem->penalty < qe->min_penalty)))
- return -1;
+ /* disregarding penalty on too few members? */
+ unsigned char usepenalty = (q->membercount <= q->penaltymemberslimit) ? 0 : 1;
+
+ if (usepenalty) {
+ if ((qe->max_penalty && (mem->penalty > qe->max_penalty)) ||
+ (qe->min_penalty && (mem->penalty < qe->min_penalty))) {
+ return -1;
+ }
+ } else {
+ ast_debug(1, "Disregarding penalty, %d members and %d in penaltymemberslimit.\n",
+ q->membercount, q->penaltymemberslimit);
+ }
switch (q->strategy) {
case QUEUE_STRATEGY_RINGALL:
/* Everyone equal, except for penalty */
- tmp->metric = mem->penalty * 1000000;
+ tmp->metric = mem->penalty * 1000000 * usepenalty;
break;
case QUEUE_STRATEGY_LINEAR:
if (pos < qe->linpos) {
@@ -3708,7 +3722,7 @@ static int calc_metric(struct call_queue *q, struct member *mem, int pos, struct
qe->linwrapped = 1;
tmp->metric = pos;
}
- tmp->metric += mem->penalty * 1000000;
+ tmp->metric += mem->penalty * 1000000 * usepenalty;
break;
case QUEUE_STRATEGY_RRMEMORY:
if (pos < q->rrpos) {
@@ -3719,25 +3733,25 @@ static int calc_metric(struct call_queue *q, struct member *mem, int pos, struct
q->wrapped = 1;
tmp->metric = pos;
}
- tmp->metric += mem->penalty * 1000000;
+ tmp->metric += mem->penalty * 1000000 * usepenalty;
break;
case QUEUE_STRATEGY_RANDOM:
tmp->metric = ast_random() % 1000;
- tmp->metric += mem->penalty * 1000000;
+ tmp->metric += mem->penalty * 1000000 * usepenalty;
break;
case QUEUE_STRATEGY_WRANDOM:
tmp->metric = ast_random() % ((1 + mem->penalty) * 1000);
break;
case QUEUE_STRATEGY_FEWESTCALLS:
tmp->metric = mem->calls;
- tmp->metric += mem->penalty * 1000000;
+ tmp->metric += mem->penalty * 1000000 * usepenalty;
break;
case QUEUE_STRATEGY_LEASTRECENT:
if (!mem->lastcall)
tmp->metric = 0;
else
tmp->metric = 1000000 - (time(NULL) - mem->lastcall);
- tmp->metric += mem->penalty * 1000000;
+ tmp->metric += mem->penalty * 1000000 * usepenalty;
break;
default:
ast_log(LOG_WARNING, "Can't calculate metric for unknown strategy %d\n", q->strategy);
diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index 56ebeed417..b80461538f 100644
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -112,6 +112,12 @@ shared_lastcall=no
;
;context = qoutcon
;
+; A limit can be set to disregard penalty settings when the queue has
+; too few members. No penalty will be weighed in if there are only X
+; or fewer queue members. (default 0)
+;
+;penaltymemberslimit = 5
+;
;----------------------QUEUE TIMING OPTIONS------------------------------------
; A Queue has two different "timeout" values associated with it. One is the
; timeout parameter configured in queues.conf. This timeout specifies the
--
GitLab