Commit 6bb4e215 authored by Mike Hibler's avatar Mike Hibler
Browse files

Put the frisbeed timeout back at the pre-mserver level (1800 seconds).

In the short run, we leave this at pre-master-server levels
for compatibility (we still support advance startup of servers
via the localhost proxy).

We also need this at Utah while we work out some MC problems on
our control net; sometimes nodes can take minutes before they
actually hook up with the server, even with the mserver.
parent fd13f641
......@@ -131,11 +131,24 @@ set_get_options(struct config_host_authinfo *ai, int ix)
strcat(str, " -W 54000000");
#endif
#if 1
/*
* In the short run, we leave this at pre-master-server levels
* for compatibility (we still support advance startup of servers
* via the localhost proxy).
*
* We also need this at Utah while we work out some MC problems on
* our control net (sometimes nodes can take minutes before they
* actually hook up with the server.
*/
strcat(str, " -T 1800");
#else
/*
* We use a small server inactive timeout since we no longer have
* to start up a frisbeed well in advance of the client(s).
*/
strcat(str, " -T 60");
#endif
ai->imageinfo[ix].get_options = mystrdup(str);
}
......
......@@ -863,21 +863,6 @@ handle_get(int sock, struct sockaddr_in *sip, struct sockaddr_in *cip,
msg->body.getreply.error = MS_ERROR_FAILED;
goto reply;
}
/*
* XXX ugh, fill in a longer wait time for the
* server since we are starting this up at some
* indeterminate time before the client.
*/
if (ii->get_options) {
char *gopts, *to = " -T 1800";
gopts = malloc(strlen(ii->get_options) +
strlen(to) + 1);
assert(gopts != NULL);
strcpy(gopts, ii->get_options);
strcat(gopts, to);
free(ii->get_options);
ii->get_options = gopts;
}
}
#endif
ci = startserver(ii, myaddr, ntohl(cip->sin_addr.s_addr),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment