check: really add back inhibited server when quorum is gained
authorVincent Bernat <bernat@luffy.cx>
Tue, 12 Oct 2010 12:12:27 +0000 (12:12 +0000)
committerAlexandre Cassen <acassen@lnxos-dev.(none)>
Wed, 8 Dec 2010 10:57:43 +0000 (11:57 +0100)
A previous change contained an erroneous check to add back alive
servers when quorum state was gained. This check was incompatible with
inhibit_on_failure. When servers were added back in the pool, the
weight was not updated accordingly.

keepalived/check/ipwrapper.c

index 25cfd78..42400c1 100644 (file)
@@ -228,8 +228,6 @@ perform_quorum_state(virtual_server *vs, int add)
                rs = ELEMENT_DATA(e);
                if (!ISALIVE(rs)) /* We only handle alive servers */
                        continue;
-               if (!(add ^ rs->set)) /* Already done */
-                       continue;
                if (add) rs->alive = 0;
                ipvs_cmd(add?LVS_CMD_ADD_DEST:LVS_CMD_DEL_DEST,
                         check_data->vs_group, vs, rs);