MEDIUM: proxy: remove state PR_STPAUSED

This state was used to mention that a proxy was in PAUSED state, as opposed
to the READY state. This was causing some trouble because if a listener
failed to resume (e.g. because its port was temporarily in use during the
resume), it was not possible to retry the operation later. Now by checking
the number of READY or PAUSED listeners instead, we can accurately know if
something went bad and try to fix it again later. The case of the temporary
port conflict during resume now works well:

  $ socat readline /tmp/sock1
  prompt
  > disable frontend testme3

  > disable frontend testme3
  All sockets are already disabled.

  > enable frontend testme3
  Failed to resume frontend, check logs for precise cause (port conflict?).

  > enable frontend testme3

  > enable frontend testme3
  All sockets are already enabled.

diff --git a/include/haproxy/proxy-t.h b/include/haproxy/proxy-t.h
index f2fdf01d51971a5b653448d10b9301141c3e0cb7..aa8038dd10bad2693570485507f34ee15532721d 100644 (file)
--- a/include/haproxy/proxy-t.h
+++ b/include/haproxy/proxy-t.h
@@ -46,7 +46,6 @@
 enum pr_state {
        PR_STNEW = 0,           /* proxy has not been initialized yet */
        PR_STREADY,             /* proxy has been initialized and is ready */
-       PR_STPAUSED,            /* frontend is paused (during hot restart) */
        PR_STSTOPPED,           /* proxy is stopped (end of a restart) */
 } __attribute__((packed));
 

diff --git a/src/proxy.c b/src/proxy.c
index 06fb0d9f6f89726d623d91acb2a95b98cc660628..bae8c1410b72bc1e98e5458889c60ec93b4374d6 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1288,8 +1288,7 @@ int pause_proxy(struct proxy *p)
 {
        struct listener *l;
 
-       if (!(p->cap & PR_CAP_FE) ||
-           p->state == PR_STSTOPPED || p->state == PR_STPAUSED)
+       if (!(p->cap & PR_CAP_FE) || p->state == PR_STSTOPPED || !p->li_ready)
                return 1;
 
        ha_warning("Pausing %s %s.\n", proxy_cap_str(p->cap), p->id);
@@ -1303,8 +1302,6 @@ int pause_proxy(struct proxy *p)
                send_log(p, LOG_WARNING, "%s %s failed to enter pause mode.\n", proxy_cap_str(p->cap), p->id);
                return 0;
        }
-
-       p->state = PR_STPAUSED;
        return 1;
 }
 
@@ -1370,7 +1367,7 @@ int resume_proxy(struct proxy *p)
        struct listener *l;
        int fail;
 
-       if (p->state != PR_STPAUSED)
+       if (p->state == PR_STSTOPPED || !p->li_paused)
                return 1;
 
        ha_warning("Enabling %s %s.\n", proxy_cap_str(p->cap), p->id);
@@ -1401,7 +1398,6 @@ int resume_proxy(struct proxy *p)
                }
        }
 
-       p->state = PR_STREADY;
        if (fail) {
                pause_proxy(p);
                return 0;
@@ -2222,8 +2218,8 @@ static int cli_parse_disable_frontend(char **args, char *payload, struct appctx
        if (px->state == PR_STSTOPPED)
                return cli_msg(appctx, LOG_NOTICE, "Frontend was previously shut down, cannot disable.\n");
 
-       if (px->state == PR_STPAUSED)
-               return cli_msg(appctx, LOG_NOTICE, "Frontend is already disabled.\n");
+       if (!px->li_ready)
+               return cli_msg(appctx, LOG_NOTICE, "All sockets are already disabled.\n");
 
        HA_SPIN_LOCK(PROXY_LOCK, &px->lock);
        ret = pause_proxy(px);
@@ -2254,8 +2250,8 @@ static int cli_parse_enable_frontend(char **args, char *payload, struct appctx *
        if (px->state == PR_STSTOPPED)
                return cli_err(appctx, "Frontend was previously shut down, cannot enable.\n");
 
-       if (px->state != PR_STPAUSED)
-               return cli_msg(appctx, LOG_NOTICE, "Frontend is already enabled.\n");
+       if (px->li_ready == px->li_all)
+               return cli_msg(appctx, LOG_NOTICE, "All sockets are already enabled.\n");
 
        HA_SPIN_LOCK(PROXY_LOCK, &px->lock);
        ret = resume_proxy(px);