From 96801b20d50c067a5db80c2f028afa57388793a0 Mon Sep 17 00:00:00 2001
From: Yaroslav Chirkov <Aidekqz@gmail.com>
Date: Mon, 2 Sep 2024 14:26:17 +0300
Subject: [PATCH] fix reloading group_rules (#682)

---
 sources/rules.c  | 17 +++++++++++------
 sources/system.c |  2 ++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/sources/rules.c b/sources/rules.c
index 4b265c7e6..05ea6b9d5 100644
--- a/sources/rules.c
+++ b/sources/rules.c
@@ -133,7 +133,7 @@ od_group_t *od_rules_group_allocate(od_global_t *global)
 		return NULL;
 	group->global = global;
 	group->check_retry = 10;
-	group->online = 1;
+	group->online = 0;
 
 	od_list_init(&group->link);
 	return group;
@@ -189,6 +189,7 @@ void od_rules_group_checker_run(void *arg)
 	od_router_t *router = global->router;
 	od_instance_t *instance = global->instance;
 
+	group->online = 1;
 	od_debug(&instance->logger, "group_checker", NULL, NULL,
 		 "start group checking");
 
@@ -434,7 +435,7 @@ od_retcode_t od_rules_groups_checkers_run(od_logger_t *logger,
 	{
 		od_rule_t *rule;
 		rule = od_container_of(i, od_rule_t, link);
-		if (rule->group) {
+		if (rule->group && !rule->obsolete && !rule->group->online) {
 			od_group_checker_run_args *args =
 				malloc(sizeof(od_group_checker_run_args));
 			args->rules = rules;
@@ -1188,10 +1189,14 @@ __attribute__((hot)) int od_rules_merge(od_rules_t *rules, od_rules_t *src,
 			rule->mark = 0;
 			rule->obsolete = is_obsolete;
 
-			if (is_obsolete && rule->refs == 0) {
-				od_rules_rule_free(rule);
-				count_deleted++;
-				count_mark--;
+			if (is_obsolete) {
+				if (rule->group) {
+					rule->group->online = 0;
+				} else if (rule->refs == 0) {
+					od_rules_rule_free(rule);
+					count_deleted++;
+					count_mark--;
+				}
 			}
 		}
 	}
diff --git a/sources/system.c b/sources/system.c
index e0945e294..e4089b067 100644
--- a/sources/system.c
+++ b/sources/system.c
@@ -535,6 +535,8 @@ void od_system_config_reload(od_system_t *system)
 
 	od_log(&instance->logger, "rules", NULL, NULL,
 	       "%d routes created/deleted and scheduled for removal", updates);
+
+	od_rules_groups_checkers_run(&instance->logger, &router->rules);
 }
 
 static inline void od_system(void *arg)