MINOR: lua: set skeleton for Lua execution expiration
This first patch permits to cofigure the Lua execution exipiration.
This expiration is configured but it is not yet avalaible, it will
be add in a future patch.
diff --git a/include/types/hlua.h b/include/types/hlua.h
index 5920e03..274659c 100644
--- a/include/types/hlua.h
+++ b/include/types/hlua.h
@@ -35,6 +35,7 @@
-1 if the memory context is not used. */
int nargs; /* The number of arguments in the stack at the start of execution. */
unsigned int flags; /* The current execution flags. */
+ int expire; /* Lua execution must be stopped over this time. */
struct task *task; /* The task associated with the lua stack execution.
We must wake this task to continue the task execution */
struct list com; /* The list head of the signals attached to this task. */
diff --git a/src/hlua.c b/src/hlua.c
index 724d5a1..7bb5f9f 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -79,6 +79,14 @@
static int class_socket_ref;
static int class_channel_ref;
+/* Global Lua execution timeout. By default Lua, execution linked
+ * with session (actions, sample-fetches and converters) have a
+ * short timeout. Lua linked with tasks doesn't have a timeout
+ * because a task may remain alive during all the haproxy execution.
+ */
+static unsigned int hlua_timeout_session = 4000; /* session timeout. */
+static unsigned int hlua_timeout_task = TICK_ETERNITY; /* task timeout. */
+
/* These functions converts types between HAProxy internal args or
* sample and LUA types. Another function permits to check if the
* LUA stack contains arguments according with an required ARG_T
@@ -2609,6 +2617,12 @@
*/
task_delete(task);
+ /* If it is the first call to the task, we must initialize the
+ * execution timeouts.
+ */
+ if (!HLUA_IS_RUNNING(hlua))
+ hlua->expire = tick_add(now_ms, hlua_timeout_task);
+
/* Execute the Lua code. */
status = hlua_ctx_resume(hlua, 1);
@@ -2768,6 +2782,9 @@
}
}
+ /* We must initialize the execution timeouts. */
+ session->hlua.expire = tick_add(now_ms, hlua_timeout_session);
+
/* Set the currently running flag. */
HLUA_SET_RUN(&session->hlua);
}
@@ -2871,6 +2888,9 @@
s->hlua.nargs++;
}
+ /* We must initialize the execution timeouts. */
+ s->hlua.expire = tick_add(now_ms, hlua_timeout_session);
+
/* Set the currently running flag. */
HLUA_SET_RUN(&s->hlua);
}
@@ -3143,6 +3163,9 @@
s->hlua.nargs++;
}
+ /* We must initialize the execution timeouts. */
+ s->hlua.expire = tick_add(now_ms, hlua_timeout_session);
+
/* Set the currently running flag. */
HLUA_SET_RUN(&s->hlua);
}
@@ -3271,6 +3294,36 @@
return 1;
}
+static int hlua_read_timeout(char **args, int section_type, struct proxy *curpx,
+ struct proxy *defpx, const char *file, int line,
+ char **err, unsigned int *timeout)
+{
+ const char *error;
+
+ error = parse_time_err(args[1], timeout, TIME_UNIT_MS);
+ if (error && *error != '\0') {
+ memprintf(err, "%s: invalid timeout", args[0]);
+ return -1;
+ }
+ return 0;
+}
+
+static int hlua_session_timeout(char **args, int section_type, struct proxy *curpx,
+ struct proxy *defpx, const char *file, int line,
+ char **err)
+{
+ return hlua_read_timeout(args, section_type, curpx, defpx,
+ file, line, err, &hlua_timeout_session);
+}
+
+static int hlua_task_timeout(char **args, int section_type, struct proxy *curpx,
+ struct proxy *defpx, const char *file, int line,
+ char **err)
+{
+ return hlua_read_timeout(args, section_type, curpx, defpx,
+ file, line, err, &hlua_timeout_task);
+}
+
/* This function is called by the main configuration key "lua-load". It loads and
* execute an lua file during the parsing of the HAProxy configuration file. It is
* the main lua entry point.
@@ -3326,7 +3379,9 @@
/* configuration keywords declaration */
static struct cfg_kw_list cfg_kws = {{ },{
- { CFG_GLOBAL, "lua-load", hlua_load },
+ { CFG_GLOBAL, "lua-load", hlua_load },
+ { CFG_GLOBAL, "tune.lua.session-timeout", hlua_session_timeout },
+ { CFG_GLOBAL, "tune.lua.task-timeout", hlua_task_timeout },
{ 0, NULL, NULL },
}};