REORG: checks: put the functions in the appropriate files !
Checks.c has become a total mess. A number of proxy or server maintenance
and queue management functions were put there probably because they were
used there, but that makes the code untouchable. And that's without saying
that their names does not always relate to what they really do!
So let's do a first pass by moving these ones :
- set_backend_down() => backend.c
- redistribute_pending() => queue.c:pendconn_redistribute()
- check_for_pending() => queue.c:pendconn_grab_from_px()
- shutdown_sessions => server.c:srv_shutdown_sessions()
- shutdown_backup_sessions => server.c:srv_shutdown_backup_sessions()
All of them were moved at once.
diff --git a/src/backend.c b/src/backend.c
index e5c2ad1..5ddb88c 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -39,11 +39,13 @@
#include <proto/lb_fwlc.h>
#include <proto/lb_fwrr.h>
#include <proto/lb_map.h>
+#include <proto/log.h>
#include <proto/obj_type.h>
#include <proto/payload.h>
#include <proto/protocol.h>
#include <proto/proto_http.h>
#include <proto/proto_tcp.h>
+#include <proto/proxy.h>
#include <proto/queue.h>
#include <proto/sample.h>
#include <proto/server.h>
@@ -1193,6 +1195,18 @@
return 0;
}
+/* sends a log message when a backend goes down, and also sets last
+ * change date.
+ */
+void set_backend_down(struct proxy *be)
+{
+ be->last_change = now.tv_sec;
+ be->down_trans++;
+
+ Alert("%s '%s' has no server available!\n", proxy_type_str(be), be->id);
+ send_log(be, LOG_EMERG, "%s %s has no server available!\n", proxy_type_str(be), be->id);
+}
+
/* Apply RDP cookie persistence to the current session. For this, the function
* tries to extract an RDP cookie from the request buffer, and look for the
* matching server in the list. If the server is found, it is assigned to the
diff --git a/src/checks.c b/src/checks.c
index 62c8779..28fd61c 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -309,98 +309,6 @@
}
}
-/* sends a log message when a backend goes down, and also sets last
- * change date.
- */
-static void set_backend_down(struct proxy *be)
-{
- be->last_change = now.tv_sec;
- be->down_trans++;
-
- Alert("%s '%s' has no server available!\n", proxy_type_str(be), be->id);
- send_log(be, LOG_EMERG, "%s %s has no server available!\n", proxy_type_str(be), be->id);
-}
-
-/* Redistribute pending connections when a server goes down. The number of
- * connections redistributed is returned.
- */
-static int redistribute_pending(struct server *s)
-{
- struct pendconn *pc, *pc_bck, *pc_end;
- int xferred = 0;
-
- FOREACH_ITEM_SAFE(pc, pc_bck, &s->pendconns, pc_end, struct pendconn *, list) {
- struct session *sess = pc->sess;
- if ((sess->be->options & (PR_O_REDISP|PR_O_PERSIST)) == PR_O_REDISP &&
- !(sess->flags & SN_FORCE_PRST)) {
- /* The REDISP option was specified. We will ignore
- * cookie and force to balance or use the dispatcher.
- */
-
- /* it's left to the dispatcher to choose a server */
- sess->flags &= ~(SN_DIRECT | SN_ASSIGNED | SN_ADDR_SET);
-
- pendconn_free(pc);
- task_wakeup(sess->task, TASK_WOKEN_RES);
- xferred++;
- }
- }
- return xferred;
-}
-
-/* Check for pending connections at the backend, and assign some of them to
- * the server coming up. The server's weight is checked before being assigned
- * connections it may not be able to handle. The total number of transferred
- * connections is returned.
- */
-static int check_for_pending(struct server *s)
-{
- int xferred;
-
- if (!s->eweight)
- return 0;
-
- for (xferred = 0; !s->maxconn || xferred < srv_dynamic_maxconn(s); xferred++) {
- struct session *sess;
- struct pendconn *p;
-
- p = pendconn_from_px(s->proxy);
- if (!p)
- break;
- p->sess->target = &s->obj_type;
- sess = p->sess;
- pendconn_free(p);
- task_wakeup(sess->task, TASK_WOKEN_RES);
- }
- return xferred;
-}
-
-/* Shutdown all connections of a server. The caller must pass a termination
- * code in <why>, which must be one of SN_ERR_* indicating the reason for the
- * shutdown.
- */
-static void shutdown_sessions(struct server *srv, int why)
-{
- struct session *session, *session_bck;
-
- list_for_each_entry_safe(session, session_bck, &srv->actconns, by_srv)
- if (session->srv_conn == srv)
- session_shutdown(session, why);
-}
-
-/* Shutdown all connections of all backup servers of a proxy. The caller must
- * pass a termination code in <why>, which must be one of SN_ERR_* indicating
- * the reason for the shutdown.
- */
-static void shutdown_backup_sessions(struct proxy *px, int why)
-{
- struct server *srv;
-
- for (srv = px->srv; srv != NULL; srv = srv->next)
- if (srv->flags & SRV_F_BACKUP)
- shutdown_sessions(srv, why);
-}
-
/* Sets server <s> down, notifies by all available means, recounts the
* remaining servers on the proxy and transfers queued sessions whenever
* possible to other servers. It automatically recomputes the number of
@@ -426,13 +334,13 @@
s->proxy->lbprm.set_server_status_down(s);
if (s->onmarkeddown & HANA_ONMARKEDDOWN_SHUTDOWNSESSIONS)
- shutdown_sessions(s, SN_ERR_DOWN);
+ srv_shutdown_sessions(s, SN_ERR_DOWN);
/* we might have sessions queued on this server and waiting for
* a connection. Those which are redispatchable will be queued
* to another server or to the proxy itself.
*/
- xferred = redistribute_pending(s);
+ xferred = pendconn_redistribute(s);
chunk_reset(&trash);
@@ -516,12 +424,12 @@
*/
if ((s->onmarkedup & HANA_ONMARKEDUP_SHUTDOWNBACKUPSESSIONS) &&
!(s->flags & SRV_F_BACKUP) && s->eweight)
- shutdown_backup_sessions(s->proxy, SN_ERR_UP);
+ srv_shutdown_backup_sessions(s->proxy, SN_ERR_UP);
/* check if we can handle some connections queued at the proxy. We
* will take as many as we can handle.
*/
- xferred = check_for_pending(s);
+ xferred = pendconn_grab_from_px(s);
chunk_reset(&trash);
@@ -567,7 +475,7 @@
* a connection. Those which are redispatchable will be queued
* to another server or to the proxy itself.
*/
- xferred = redistribute_pending(s);
+ xferred = pendconn_redistribute(s);
chunk_reset(&trash);
@@ -607,7 +515,7 @@
/* check if we can handle some connections queued at the proxy. We
* will take as many as we can handle.
*/
- xferred = check_for_pending(s);
+ xferred = pendconn_grab_from_px(s);
chunk_reset(&trash);
@@ -1492,7 +1400,7 @@
server_recalc_eweight(s);
/* probably that we can refill this server with a bit more connections */
- check_for_pending(s);
+ pendconn_grab_from_px(s);
/* get back there in 1 second or 1/20th of the slowstart interval,
* whichever is greater, resulting in small 5% steps.
diff --git a/src/queue.c b/src/queue.c
index 21a48d6..8b4d9ed 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -167,6 +167,61 @@
return p;
}
+/* Redistribute pending connections when a server goes down. The number of
+ * connections redistributed is returned.
+ */
+int pendconn_redistribute(struct server *s)
+{
+ struct pendconn *pc, *pc_bck;
+ int xferred = 0;
+
+ list_for_each_entry_safe(pc, pc_bck, &s->pendconns, list) {
+ struct session *sess = pc->sess;
+
+ if ((sess->be->options & (PR_O_REDISP|PR_O_PERSIST)) == PR_O_REDISP &&
+ !(sess->flags & SN_FORCE_PRST)) {
+ /* The REDISP option was specified. We will ignore
+ * cookie and force to balance or use the dispatcher.
+ */
+
+ /* it's left to the dispatcher to choose a server */
+ sess->flags &= ~(SN_DIRECT | SN_ASSIGNED | SN_ADDR_SET);
+
+ pendconn_free(pc);
+ task_wakeup(sess->task, TASK_WOKEN_RES);
+ xferred++;
+ }
+ }
+ return xferred;
+}
+
+/* Check for pending connections at the backend, and assign some of them to
+ * the server coming up. The server's weight is checked before being assigned
+ * connections it may not be able to handle. The total number of transferred
+ * connections is returned.
+ */
+int pendconn_grab_from_px(struct server *s)
+{
+ int xferred;
+
+ if (!s->eweight)
+ return 0;
+
+ for (xferred = 0; !s->maxconn || xferred < srv_dynamic_maxconn(s); xferred++) {
+ struct session *sess;
+ struct pendconn *p;
+
+ p = pendconn_from_px(s->proxy);
+ if (!p)
+ break;
+ p->sess->target = &s->obj_type;
+ sess = p->sess;
+ pendconn_free(p);
+ task_wakeup(sess->task, TASK_WOKEN_RES);
+ }
+ return xferred;
+}
+
/*
* Detaches pending connection <p>, decreases the pending count, and frees
* the pending connection. The connection might have been queued to a specific
diff --git a/src/server.c b/src/server.c
index 0351411..07d2436 100644
--- a/src/server.c
+++ b/src/server.c
@@ -22,8 +22,12 @@
#include <proto/port_range.h>
#include <proto/protocol.h>
+#include <proto/queue.h>
#include <proto/raw_sock.h>
#include <proto/server.h>
+#include <proto/session.h>
+#include <proto/task.h>
+
/* List head of all known server keywords */
static struct srv_kw_list srv_keywords = {
@@ -156,6 +160,32 @@
return 0;
}
+/* Shutdown all connections of a server. The caller must pass a termination
+ * code in <why>, which must be one of SN_ERR_* indicating the reason for the
+ * shutdown.
+ */
+void srv_shutdown_sessions(struct server *srv, int why)
+{
+ struct session *session, *session_bck;
+
+ list_for_each_entry_safe(session, session_bck, &srv->actconns, by_srv)
+ if (session->srv_conn == srv)
+ session_shutdown(session, why);
+}
+
+/* Shutdown all connections of all backup servers of a proxy. The caller must
+ * pass a termination code in <why>, which must be one of SN_ERR_* indicating
+ * the reason for the shutdown.
+ */
+void srv_shutdown_backup_sessions(struct proxy *px, int why)
+{
+ struct server *srv;
+
+ for (srv = px->srv; srv != NULL; srv = srv->next)
+ if (srv->flags & SRV_F_BACKUP)
+ srv_shutdown_sessions(srv, why);
+}
+
/* Note: must not be declared <const> as its list will be overwritten.
* Please take care of keeping this list alphabetically sorted, doing so helps
* all code contributors.