r1237 - in trunk/varnish-cache: bin/varnishd include lib/libvcl
phk at projects.linpro.no
phk at projects.linpro.no
Mon Jan 22 13:31:53 CET 2007
Author: phk
Date: 2007-01-22 13:31:52 +0100 (Mon, 22 Jan 2007)
New Revision: 1237
Modified:
trunk/varnish-cache/bin/varnishd/cache.h
trunk/varnish-cache/bin/varnishd/cache_backend.c
trunk/varnish-cache/bin/varnishd/cache_vrt.c
trunk/varnish-cache/include/vrt_obj.h
trunk/varnish-cache/lib/libvcl/flint.lnt
trunk/varnish-cache/lib/libvcl/vcc_compile.c
trunk/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
trunk/varnish-cache/lib/libvcl/vcc_obj.c
Log:
The getaddrinfo(3) API does not tell us the TTL value learned from DNS
so we have to add our own stuff for that.
Without some kind of TTL, we would hit the DNS server once per failed
attempt to connect to the backend.
If the backend were down, we could hit it a LOT.
In the VCL code:
backend foobar {
[...]
set backend.dnsttl = 20s;
}
will assign a TTL for DNS lookups of this backends hostname+port
combination, we will not hit the DNS server more often that this.
The default is set at 30 seconds, short enough to make things are
workable in a load-balancing-via-DNS setups, yet long enough to not
pound the DNS server flat in case of backend failures.
NOTE that as long as we succeed in connecting to the backend we
do not perform new DNS lookups. That will have to be revisited
along with possible load-balancing schemes for the backend(s).
Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h 2007-01-22 11:46:25 UTC (rev 1236)
+++ trunk/varnish-cache/bin/varnishd/cache.h 2007-01-22 12:31:52 UTC (rev 1237)
@@ -302,6 +302,9 @@
struct addrinfo *last_addr;
TAILQ_HEAD(,vbe_conn) connlist;
+
+ double dnsttl;
+ double dnstime;
#if 0
double responsetime;
double timeout;
Modified: trunk/varnish-cache/bin/varnishd/cache_backend.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend.c 2007-01-22 11:46:25 UTC (rev 1236)
+++ trunk/varnish-cache/bin/varnishd/cache_backend.c 2007-01-22 12:31:52 UTC (rev 1237)
@@ -59,12 +59,25 @@
static MTX vbemtx;
/*--------------------------------------------------------------------*/
+/* XXX: belongs a more general place */
+static double
+Uptime(void)
+{
+ struct timespec ts;
+
+ assert(clock_gettime(CLOCK_MONOTONIC, &ts) == 0);
+ return (ts.tv_sec + ts.tv_nsec * 1e-9);
+}
+
+/*--------------------------------------------------------------------*/
+
static struct vbe_conn *
vbe_new_conn(void)
{
struct vbe_conn *vbc;
- unsigned char *p, space;
+ unsigned char *p;
+ unsigned space;
space = params->mem_workspace;
vbc = calloc(sizeof *vbc + space * 2, 1);
@@ -93,6 +106,7 @@
if (bp->addr != NULL) {
freeaddrinfo(bp->addr);
bp->addr = NULL;
+ bp->last_addr = NULL;
}
memset(&hint, 0, sizeof hint);
@@ -102,13 +116,14 @@
error = getaddrinfo(bp->hostname,
bp->portname == NULL ? "http" : bp->portname,
&hint, &res);
+ bp->dnstime = Uptime();
if (error) {
if (res != NULL)
freeaddrinfo(res);
printf("getaddrinfo: %s\n", gai_strerror(error)); /* XXX */
- bp->addr = NULL;
return;
}
+ bp->last_addr = res;
bp->addr = res;
}
@@ -120,9 +135,7 @@
int s;
s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
- if (s < 0)
- return (s);
- else if (connect(s, ai->ai_addr, ai->ai_addrlen)) {
+ if (s >= 0 && connect(s, ai->ai_addr, ai->ai_addrlen)) {
AZ(close(s));
s = -1;
}
@@ -157,6 +170,9 @@
}
}
+ if (bp->dnstime + bp->dnsttl >= Uptime())
+ return (-1);
+
/* Then do another lookup to catch DNS changes */
vbe_lookup(bp);
Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c 2007-01-22 11:46:25 UTC (rev 1236)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c 2007-01-22 12:31:52 UTC (rev 1237)
@@ -124,6 +124,7 @@
cp->backend[i] = calloc(sizeof *cp->backend[i], 1);
XXXAN(cp->backend[i]);
cp->backend[i]->magic = BACKEND_MAGIC;
+ cp->backend[i]->dnsttl = 30;
TAILQ_INIT(&cp->backend[i]->connlist);
}
}
@@ -160,6 +161,7 @@
VBACKEND(const char *, host, hostname)
VBACKEND(const char *, port, portname)
+VBACKEND(double, dnsttl, dnsttl)
/*--------------------------------------------------------------------
* XXX: Working relative to t_req is maybe not the right thing, we could
Modified: trunk/varnish-cache/include/vrt_obj.h
===================================================================
--- trunk/varnish-cache/include/vrt_obj.h 2007-01-22 11:46:25 UTC (rev 1236)
+++ trunk/varnish-cache/include/vrt_obj.h 2007-01-22 12:31:52 UTC (rev 1237)
@@ -10,6 +10,8 @@
void VRT_l_backend_host(struct backend *, const char *);
const char * VRT_r_backend_port(struct backend *);
void VRT_l_backend_port(struct backend *, const char *);
+double VRT_r_backend_dnsttl(struct backend *);
+void VRT_l_backend_dnsttl(struct backend *, double);
const unsigned char * VRT_r_client_ip(struct sess *);
void VRT_l_client_ip(struct sess *, const unsigned char *);
const char * VRT_r_req_request(struct sess *);
Modified: trunk/varnish-cache/lib/libvcl/flint.lnt
===================================================================
--- trunk/varnish-cache/lib/libvcl/flint.lnt 2007-01-22 11:46:25 UTC (rev 1236)
+++ trunk/varnish-cache/lib/libvcl/flint.lnt 2007-01-22 12:31:52 UTC (rev 1237)
@@ -6,6 +6,7 @@
-printf_code( ju, long long unsigned)
-printf_code( jx, long long unsigned)
++libh ../../config.h
-header(../../config.h)
-sem(lbv_assert, r_no)
-sem(strchr, 1p, type(1), 2n == 0 ? (@p < 1p) : (@p < 1p || @p == 0 ))
Modified: trunk/varnish-cache/lib/libvcl/vcc_compile.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_compile.c 2007-01-22 11:46:25 UTC (rev 1236)
+++ trunk/varnish-cache/lib/libvcl/vcc_compile.c 2007-01-22 12:31:52 UTC (rev 1237)
@@ -258,6 +258,7 @@
t->e = strchr(s, '\0');
t->tok = METHOD;
AddRef(tl, t, type);
+ /* XXX: possibly leaking t */
}
void
@@ -931,6 +932,7 @@
static void
Backend(struct tokenlist *tl)
{
+ unsigned a;
struct var *vp;
struct token *t_be = NULL;
struct token *t_host = NULL;
@@ -984,6 +986,27 @@
Fc(tl, 0, ");\n");
vcc_NextToken(tl);
break;
+#if 0
+ case INT:
+ case SIZE:
+ case RATE:
+ case FLOAT:
+#endif
+ case TIME:
+ Fc(tl, 1, "\t%s ", vp->lname);
+ a = tl->t->tok;
+ if (a == T_MUL || a == T_DIV)
+ Fc(tl, 0, "%g", DoubleVal(tl));
+ else if (vp->fmt == TIME)
+ TimeVal(tl);
+ else if (vp->fmt == SIZE)
+ SizeVal(tl);
+ else if (vp->fmt == RATE)
+ RateVal(tl);
+ else
+ Fc(tl, 0, "%g", DoubleVal(tl));
+ Fc(tl, 0, ");\n");
+ break;
default:
vsb_printf(tl->sb,
"Assignments not possible for '%s'\n", vp->name);
Modified: trunk/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_gen_obj.tcl 2007-01-22 11:46:25 UTC (rev 1236)
+++ trunk/varnish-cache/lib/libvcl/vcc_gen_obj.tcl 2007-01-22 12:31:52 UTC (rev 1237)
@@ -32,24 +32,25 @@
# Objects which operate on backends
set beobj {
- { backend.host HOSTNAME }
- { backend.port PORTNAME }
+ { backend.host HOSTNAME }
+ { backend.port PORTNAME }
+ { backend.dnsttl TIME }
}
# Objects which operate on sessions
set spobj {
- { client.ip IP }
- { req.request STRING }
- { req.host STRING }
- { req.url STRING }
- { req.proto STRING }
- { req.backend BACKEND }
- { obj.valid BOOL }
- { obj.cacheable BOOL }
- { obj.ttl TIME }
- { req.http. HEADER }
- { resp.http. HEADER }
+ { client.ip IP }
+ { req.request STRING }
+ { req.host STRING }
+ { req.url STRING }
+ { req.proto STRING }
+ { req.backend BACKEND }
+ { obj.valid BOOL }
+ { obj.cacheable BOOL }
+ { obj.ttl TIME }
+ { req.http. HEADER }
+ { resp.http. HEADER }
}
set tt(IP) "const unsigned char *"
Modified: trunk/varnish-cache/lib/libvcl/vcc_obj.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_obj.c 2007-01-22 11:46:25 UTC (rev 1236)
+++ trunk/varnish-cache/lib/libvcl/vcc_obj.c 2007-01-22 12:31:52 UTC (rev 1237)
@@ -18,6 +18,10 @@
"VRT_r_backend_port(backend)",
"VRT_l_backend_port(backend, ",
},
+ { "backend.dnsttl", TIME, 14,
+ "VRT_r_backend_dnsttl(backend)",
+ "VRT_l_backend_dnsttl(backend, ",
+ },
{ NULL }
};
@@ -82,6 +86,8 @@
"void VRT_l_backend_host(struct backend *, const char *);\n"
"const char * VRT_r_backend_port(struct backend *);\n"
"void VRT_l_backend_port(struct backend *, const char *);\n"
+ "double VRT_r_backend_dnsttl(struct backend *);\n"
+ "void VRT_l_backend_dnsttl(struct backend *, double);\n"
"const unsigned char * VRT_r_client_ip(struct sess *);\n"
"void VRT_l_client_ip(struct sess *, const unsigned char *);\n"
"const char * VRT_r_req_request(struct sess *);\n"
More information about the varnish-commit
mailing list