From 771127e2d24bbb8f7344840fdfa5936a61209c7e Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Mon, 11 Apr 2011 11:04:07 +0200 Subject: Set same status for duplicate servers --- src/providers/fail_over.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'src/providers/fail_over.c') diff --git a/src/providers/fail_over.c b/src/providers/fail_over.c index 085b1a41d..2e662fb72 100644 --- a/src/providers/fail_over.c +++ b/src/providers/fail_over.c @@ -1311,6 +1311,8 @@ fo_set_server_status(struct fo_server *server, enum server_status status) void fo_set_port_status(struct fo_server *server, enum port_status status) { + struct fo_server *siter; + DEBUG(4, ("Marking port %d of server '%s' as '%s'\n", server->port, SERVER_NAME(server), str_port_status(status))); @@ -1320,6 +1322,25 @@ fo_set_port_status(struct fo_server *server, enum port_status status) fo_set_server_status(server, SERVER_WORKING); server->service->active_server = server; } + + if (!server->common || !server->common->name) return; + + /* It is possible to introduce duplicates when expanding SRV results + * into fo_server structures. Find the duplicates and set the same + * status */ + DLIST_FOR_EACH(siter, server->service->server_list) { + if (siter == server) continue; + if (!siter->common || !siter->common->name) continue; + + if (siter->port == server->port && + (strcasecmp(siter->common->name, server->common->name) == 0)) { + DEBUG(7, ("Marking port %d of duplicate server '%s' as '%s'\n", + siter->port, SERVER_NAME(siter), + str_port_status(status))); + siter->port_status = status; + gettimeofday(&siter->last_status_change, NULL); + } + } } void fo_try_next_server(struct fo_service *service) -- cgit