Merge pull request #2320 from pqarmitage/updates

Improve ipvs/checkers reload time

configure.ac

@@ -2815,9 +2815,11 @@ fi
 dnl ----[ Profiling or not ? ]----
 WITH_PROFILING=No
 if test "${enable_profile}" = yes; then
+  # gprof keepalived/keepalived /gmon.keepalived.PID >/tmp/prof.PID.op to generate profile
   WITH_PROFILING=Yes
   add_config_opt([PROFILING])
   add_to_var([KA_CFLAGS], [-pg])
+  AC_DEFINE([_WITH_PROFILING_], [ 1 ], [Define to 1 to build with profiling support])
 fi
 AM_CONDITIONAL([PROFILE], [test $WITH_PROFILING = Yes])
 

keepalived/bfd/bfd_daemon.c

@@ -28,6 +28,9 @@
 #include <sys/prctl.h>
 #include <fcntl.h>
 #include <sys/time.h>
+#ifdef _WITH_PROFILING_
+#include <sys/gmon.h>
+#endif
 
 #include "bfd.h"
 #include "bfd_daemon.h"
@@ -388,6 +391,11 @@ start_bfd_child(void)
 		return 0;
 	}
 
+#ifdef _WITH_PROFILING_
+	/* See https://lists.gnu.org/archive/html/bug-gnu-utils/2001-09/msg00047.html for details */
+	monstartup ((u_long) &_start, (u_long) &etext);
+#endif
+
 	prctl(PR_SET_PDEATHSIG, SIGTERM);
 
 	/* Check our parent hasn't already changed since the fork */

keepalived/check/check_api.c

@@ -56,7 +56,6 @@
 
 
 /* Global vars */
-LIST_HEAD_INITIALIZE(checkers_queue);
 #ifdef _CHECKER_DEBUG_
 bool do_checker_debug;
 #endif
@@ -66,17 +65,9 @@ checker_t *current_checker;
 void
 free_checker(checker_t *checker)
 {
-	list_del_init(&checker->e_list);
+	list_del_init(&checker->rs_list);
 	(*checker->checker_funcs->free_func) (checker);
 }
-void
-free_checker_list(list_head_t *l)
-{
-	checker_t *checker, *checker_tmp;
-
-	list_for_each_entry_safe(checker, checker_tmp, l, e_list)
-		free_checker(checker);
-}
 
 /* dump checker data */
 static void
@@ -107,14 +98,6 @@ dump_checker(FILE *fp, const checker_t *checker)
 
 	(*checker->checker_funcs->dump_func) (fp, checker);
 }
-static void
-dump_checker_list(FILE *fp, const list_head_t *l)
-{
-	checker_t *checker;
-
-	list_for_each_entry(checker, l, e_list)
-		dump_checker(fp, checker);
-}
 
 void
 dump_connection_opts(FILE *fp, const void *data)
@@ -135,7 +118,7 @@ dump_connection_opts(FILE *fp, const void *data)
 		conf_write(fp, "     Last errno = %d", conn->last_errno);
 }
 
-/* Queue a checker into the checkers_queue */
+/* Queue a checker into the real server's checkers_queue */
 void
 queue_checker(const checker_funcs_t *funcs
 	      , thread_func_t launch
@@ -152,7 +135,7 @@ queue_checker(const checker_funcs_t *funcs
 	}
 
 	PMALLOC(checker);
-	INIT_LIST_HEAD(&checker->e_list);
+	INIT_LIST_HEAD(&checker->rs_list);
 	checker->checker_funcs = funcs;
 	checker->launch = launch;
 	checker->vs = current_vs;
@@ -173,6 +156,8 @@ queue_checker(const checker_funcs_t *funcs
 	if (fd_required)
 		check_data->num_checker_fd_required++;
 
+	list_add_tail(&checker->rs_list, &current_rs->checkers_list);
+
 	current_checker = checker;
 }
 
@@ -455,86 +440,74 @@ install_checker_common_keywords(bool connection_keywords)
 	install_keyword("log_all_failures", &log_all_failures_handler);
 }
 
-/* dump the checkers_queue */
-void
-dump_checkers_queue(FILE *fp)
-{
-	if (!list_empty(&checkers_queue)) {
-		conf_write(fp, "------< Health checkers >------");
-		dump_checker_list(fp, &checkers_queue);
-	}
-}
-
-/* init the global checkers queue */
+/* dump the checkers */
 void
-init_checkers_queue(void)
+dump_checkers(FILE *fp)
 {
-	INIT_LIST_HEAD(&checkers_queue);
-}
-
-/* release the checkers for a virtual server */
-void
-free_vs_checkers(const virtual_server_t *vs)
-{
-	checker_t *checker, *checker_tmp;
-
-	list_for_each_entry_safe(checker, checker_tmp, &checkers_queue, e_list) {
-		if (checker->vs != vs)
-			continue;
+	virtual_server_t *vs;
+	real_server_t *rs;
+	checker_t *checker;
+	bool dumped_header = false;
 
-		free_checker(checker);
+	list_for_each_entry(vs, &check_data->vs, e_list) {
+		list_for_each_entry(rs, &vs->rs, e_list) {
+			list_for_each_entry(checker, &rs->checkers_list, rs_list) {
+				if (!dumped_header) {
+					conf_write(fp, "------< Health checkers >------");
+					dumped_header = true;
+				}
+
+				dump_checker(fp, checker);
+			}
+		}
 	}
 }
 
-/* release the checkers for a virtual server */
+/* release the checkers for a real server */
 void
 free_rs_checkers(const real_server_t *rs)
 {
 	checker_t *checker, *checker_tmp;
 
-	list_for_each_entry_safe(checker, checker_tmp, &checkers_queue, e_list) {
-		if (checker->rs != rs)
-			continue;
-
+	list_for_each_entry_safe(checker, checker_tmp, &rs->checkers_list, rs_list)
 		free_checker(checker);
-	}
-}
-
-/* release the checkers_queue */
-void
-free_checkers_queue(void)
-{
-	free_checker_list(&checkers_queue);
 }
 
 /* register checkers to the global I/O scheduler */
 void
 register_checkers_thread(void)
 {
+	virtual_server_t *vs;
+	real_server_t *rs;
 	checker_t *checker;
 	unsigned long warmup;
 
-	list_for_each_entry(checker, &checkers_queue, e_list) {
-		if (checker->launch) {
-			if (checker->vs->ha_suspend && !checker->vs->ha_suspend_addr_count)
-				checker->enabled = false;
-
-			log_message(LOG_INFO, "%sctivating healthchecker for service %s for VS %s"
-					    , checker->enabled ? "A" : "Dea"
-					    , FMT_RS(checker->rs, checker->vs)
-					    , FMT_VS(checker->vs));
-
-			/* wait for a random timeout to begin checker thread.
-			   It helps avoiding multiple simultaneous checks to
-			   the same RS.
-			*/
-			warmup = checker->warmup;
-			if (warmup) {
-				/* coverity[dont_call] */
-				warmup = warmup * (unsigned)random() / RAND_MAX;
+	list_for_each_entry(vs, &check_data->vs, e_list) {
+		list_for_each_entry(rs, &vs->rs, e_list) {
+			list_for_each_entry(checker, &rs->checkers_list, rs_list) {
+				if (checker->launch) {
+					if (checker->vs->ha_suspend && !checker->vs->ha_suspend_addr_count)
+						checker->enabled = false;
+
+					if (!checker->enabled || !checker->has_run)
+						log_message(LOG_INFO, "%sctivating healthchecker for service %s for VS %s"
+								    , checker->enabled ? "A" : "Dea"
+								    , FMT_RS(checker->rs, checker->vs)
+								    , FMT_VS(checker->vs));
+
+					/* wait for a random timeout to begin checker thread.
+					   It helps avoiding multiple simultaneous checks to
+					   the same RS.
+					*/
+					warmup = checker->warmup;
+					if (warmup) {
+						/* coverity[dont_call] */
+						warmup = warmup * (unsigned)random() / RAND_MAX;
+					}
+					thread_add_timer(master, checker->launch, checker,
+							 BOOTSTRAP_DELAY + warmup);
+				}
 			}
-			thread_add_timer(master, checker->launch, checker,
-					 BOOTSTRAP_DELAY + warmup);
 		}
 	}
 
@@ -636,6 +609,7 @@ update_checker_activity(sa_family_t family, void *address, bool enable)
 {
 	checker_t *checker;
 	virtual_server_t *vs;
+	real_server_t *rs;
 	char addr_str[INET6_ADDRSTRLEN];
 	bool address_logged = false;
 
@@ -649,9 +623,6 @@ update_checker_activity(sa_family_t family, void *address, bool enable)
 	if (!using_ha_suspend)
 		return;
 
-	if (list_empty(&checkers_queue))
-		return;
-
 	/* Check if any of the virtual servers are using this address, and have ha_suspend */
 	list_for_each_entry(vs, &check_data->vs, e_list) {
 		if (!vs->ha_suspend)
@@ -681,16 +652,15 @@ update_checker_activity(sa_family_t family, void *address, bool enable)
 			vs->ha_suspend_addr_count--;
 
 		/* Processing Healthcheckers queue for this vs */
-		list_for_each_entry(checker, &checkers_queue, e_list) {
-			if (checker->vs != vs)
-				continue;
-
-			if (enable != checker->enabled &&
-			    (enable || vs->ha_suspend_addr_count == 0)) {
-				log_message(LOG_INFO, "%sing healthchecker for service %s for VS %s",
-							!checker->enabled ? "Activat" : "Suspend",
-							FMT_RS(checker->rs, checker->vs), FMT_VS(checker->vs));
-				checker->enabled = enable;
+		list_for_each_entry(rs, &vs->rs, e_list) {
+			list_for_each_entry(checker, &rs->checkers_list, rs_list) {
+				if (enable != checker->enabled &&
+				    (enable || vs->ha_suspend_addr_count == 0)) {
+					log_message(LOG_INFO, "%sing healthchecker for service %s for VS %s",
+								!checker->enabled ? "Activat" : "Suspend",
+								FMT_RS(checker->rs, checker->vs), FMT_VS(checker->vs));
+					checker->enabled = enable;
+				}
 			}
 		}
 	}

keepalived/check/check_bfd.c

@@ -245,9 +245,6 @@ bfd_end_handler(void)
 	top->type = TRACK_CHECKER;
 	top->obj.checker = current_checker;
 	list_add_tail(&top->e_list, &bfdc->bfd->tracking_rs);
-
-	/* queue the checker */
-	list_add_tail(&current_checker->e_list, &checkers_queue);
 }
 
 void