Changeset 4381

Timestamp:

12/03/09 12:02:46 (8 months ago)

Author:

tfheen

Message:

Merge r4356, r4357: Don't half-close probes, add .expected_response

r4356:
Don't halfclose the backend polling TCP connection after sending the
request, some backends gets confused by this.

Add a ".status" to backend polling, to configure the expected HTTP
status code for a good poll.

Fixes #584

r4357:
.expected_response is a better idea than .status

Tip o' the hat to: tfheen

Location:

branches/2.0/varnish-cache

Files:

• bin/varnishd/cache_backend_poll.c (modified) (3 diffs)
• bin/varnishd/cache_backend_poll.h (modified) (1 diff)
• bin/varnishtest/tests/v00002.vtc (modified) (1 diff)
• bin/varnishtest/tests/v00005.vtc (modified) (1 diff)
• include/vrt.h (modified) (1 diff)
• lib/libvcl/vcc_backend.c (modified) (4 diffs)
• lib/libvcl/vcc_fixed_token.c (modified) (2 diffs)

branches/2.0/varnish-cache/bin/varnishd/cache_backend_poll.c

@@ -173 +173 @@
         }
         vt->good_xmit |= 1;
-
-        /* And do a shutdown(WR) so we know that the backend got it */
-        i = shutdown(s, SHUT_WR);
-        if (i != 0) {
-                vt->err_shut |= 1;
-                TCP_close(&s);
-                return;
-        }
-        vt->good_shut |= 1;
-
-        /* Check if that took too long time */
-        t_now = TIM_real();
-        tmo = (int)round((t_end - t_now) * 1e3);
-        if (tmo < 0) {
-                TCP_close(&s);
-                return;
-        }
 
         pfd->fd = s;
@@ -237 +220 @@
         i = sscanf(vt->resp_buf, "HTTP/%*f %u %s", &resp, buf);
 
-        if (i == 2 && resp == 200)
+        if (i == 2 && resp == vt->probe.exp_status)
                 vt->happy |= 1;
 }
@@ -336 +319 @@
         if (vt->probe.threshold == 0)
                 vt->probe.threshold = 3;
+        if (vt->probe.exp_status == 0)
+                vt->probe.exp_status = 200;
 
         if (vt->probe.threshold == ~0U)

branches/2.0/varnish-cache/bin/varnishd/cache_backend_poll.h

@@ -34 +34 @@
 BITMAP( err_xmit, 'x', "Error Xmit", 0)
 BITMAP(good_xmit, 'X', "Good Xmit", 0)
-BITMAP( err_shut, 's', "Error Shut", 0)
-BITMAP(good_shut, 'S', "Good Shut", 0)
 BITMAP( err_recv, 'r', "Error Recv", 0)
 BITMAP(good_recv, 'R', "Good Recv", 0)

branches/2.0/varnish-cache/bin/varnishtest/tests/v00002.vtc

@@ -186 +186 @@
 }
 
+
+varnish v1 -badvcl {
+        backend b1 {
+                .host = "127.0.0.1";
+                .probe = { .expected_response = 13; }
+        }
+}
+

branches/2.0/varnish-cache/bin/varnishtest/tests/v00005.vtc

@@ -2 +2 @@
 
 test "VCL: test backend probe syntax"
+
+# Check status definition
+varnish v1 -vcl {
+        backend b1 {
+                .host = "127.0.0.1";
+                .probe = {
+                        .expected_response = 204;
+                }
+        }
+}
 
 # Check url definition

branches/2.0/varnish-cache/include/vrt.h

@@ -53 +53 @@
         double          timeout;
         double          interval;
+        unsigned        exp_status;
         unsigned        window;
         unsigned        threshold;

branches/2.0/varnish-cache/lib/libvcl/vcc_backend.c

@@ -342 +342 @@
         struct token *t_did = NULL, *t_window = NULL, *t_threshold = NULL;
         struct token *t_initial = NULL;
-        unsigned window, threshold, initial;
+        unsigned window, threshold, initial, status;
 
         fs = vcc_FldSpec(tl,
             "?url",
             "?request",
+            "?expected_response",
             "?timeout",
             "?interval",
@@ -360 +361 @@
         threshold = 0;
         initial = 0;
+        status = 0;
         Fb(tl, 0, "\t.probe = {\n");
         while (tl->t->tok != '}') {
@@ -403 +405 @@
                         t_initial = tl->t;
                         initial = vcc_UintVal(tl);
+                        vcc_NextToken(tl);
+                        ERRCHK(tl);
+                } else if (vcc_IdIs(t_field, "expected_response")) {
+                        status = vcc_UintVal(tl);
+                        if (status < 100 || status > 999) {
+                                vsb_printf(tl->sb,
+                                    "Must specify .status with exactly three "
+                                    " digits (100 <= x <= 999)\n");
+                                vcc_ErrWhere(tl, tl->t);
+                                return;
+                        }
                         vcc_NextToken(tl);
                         ERRCHK(tl);
@@ -456 +469 @@
         else
                 Fb(tl, 0, "\t\t.initial = ~0U,\n", initial);
+        if (status > 0)
+                Fb(tl, 0, "\t\t.exp_status = %u,\n", status);
         Fb(tl, 0, "\t},\n");
         ExpectErr(tl, '}');

branches/2.0/varnish-cache/lib/libvcl/vcc_fixed_token.c

@@ -247 +247 @@
         vsb_cat(sb, "\nstruct vrt_backend_probe {\n\tconst char\t*url;\n");
         vsb_cat(sb, "\tconst char\t*request;\n\tdouble\t\ttimeout;\n");
-        vsb_cat(sb, "\tdouble\t\tinterval;\n\tunsigned\twindow;\n");
-        vsb_cat(sb, "\tunsigned\tthreshold;\n\tunsigned\tinitial;\n");
-        vsb_cat(sb, "};\n\n/*\n * A backend is a host+port somewhere on the");
-        vsb_cat(sb, " network\n */\nstruct vrt_backend {\n");
-        vsb_cat(sb, "\tconst char\t\t\t*vcl_name;\n\tconst char\t\t\t*ident");
-        vsb_cat(sb, ";\n\n\tconst char\t\t\t*hosthdr;\n");
-        vsb_cat(sb, "\n\tconst unsigned char\t\t*ipv4_sockaddr;\n");
+        vsb_cat(sb, "\tdouble\t\tinterval;\n\tunsigned\texp_status;\n");
+        vsb_cat(sb, "\tunsigned\twindow;\n\tunsigned\tthreshold;\n");
+        vsb_cat(sb, "\tunsigned\tinitial;\n};\n\n/*\n");
+        vsb_cat(sb, " * A backend is a host+port somewhere on the network\n");
+        vsb_cat(sb, " */\nstruct vrt_backend {\n\tconst char\t\t\t*vcl_name");
+        vsb_cat(sb, ";\n\tconst char\t\t\t*ident;\n\n");
+        vsb_cat(sb, "\tconst char\t\t\t*hosthdr;\n\n");
+        vsb_cat(sb, "\tconst unsigned char\t\t*ipv4_sockaddr;\n");
         vsb_cat(sb, "\tconst unsigned char\t\t*ipv6_sockaddr;\n");
         vsb_cat(sb, "\n\tdouble\t\t\t\tconnect_timeout;\n");
@@ -325 +326 @@
         /* ../../include/vrt_obj.h */
 
-        vsb_cat(sb, "/*\n * $Id: vcc_gen_obj.tcl 4082 2009-05-19 07:14:00Z ");
-        vsb_cat(sb, "sky $\n *\n * NB:  This file is machine generated, DO ");
-        vsb_cat(sb, "NOT EDIT!\n *\n * Edit vcc_gen_obj.tcl instead\n");
+        vsb_cat(sb, "/*\n * $Id$\n");
+        vsb_cat(sb, " *\n * NB:  This file is machine generated, DO NOT EDI");
+        vsb_cat(sb, "T!\n *\n * Edit vcc_gen_obj.tcl instead\n");
         vsb_cat(sb, " */\n\nstruct sockaddr * VRT_r_client_ip(const struct ");
         vsb_cat(sb, "sess *);\nstruct sockaddr * VRT_r_server_ip(struct ses");