提交 843ffe8a 编写于 作者: R Richard W.M. Jones 提交者: Cole Robinson

Add functions for handling exponential backoff loops.

In a few places in libvirt we busy-wait for events, for example qemu
creating a monitor socket.  This is problematic because:

 - We need to choose a sufficiently small polling period so that
   libvirt doesn't add unnecessary delays.

 - We need to choose a sufficiently large polling period so that
   the effect of busy-waiting doesn't affect the system.

The solution to this conflict is to use an exponential backoff.

This patch adds two functions to hide the details, and modifies a few
places where we currently busy-wait.
Signed-off-by: NRichard W.M. Jones <rjones@redhat.com>
(cherry picked from commit beaa447a)
上级 f87f1ab4
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include "virfile.h" #include "virfile.h"
#include "configmake.h" #include "configmake.h"
#include "virstring.h" #include "virstring.h"
#include "virtime.h"
#define VIR_FROM_THIS VIR_FROM_STREAMS #define VIR_FROM_THIS VIR_FROM_STREAMS
...@@ -520,8 +521,7 @@ int virFDStreamConnectUNIX(virStreamPtr st, ...@@ -520,8 +521,7 @@ int virFDStreamConnectUNIX(virStreamPtr st,
bool abstract) bool abstract)
{ {
struct sockaddr_un sa; struct sockaddr_un sa;
size_t i = 0; virTimeBackOffVar timeout;
int timeout = 3;
int ret; int ret;
int fd = socket(AF_UNIX, SOCK_STREAM, 0); int fd = socket(AF_UNIX, SOCK_STREAM, 0);
...@@ -541,7 +541,9 @@ int virFDStreamConnectUNIX(virStreamPtr st, ...@@ -541,7 +541,9 @@ int virFDStreamConnectUNIX(virStreamPtr st,
goto error; goto error;
} }
do { if (virTimeBackOffStart(&timeout, 1, 3*1000 /* ms */) < 0)
goto error;
while (virTimeBackOffWait(&timeout)) {
ret = connect(fd, (struct sockaddr *)&sa, sizeof(sa)); ret = connect(fd, (struct sockaddr *)&sa, sizeof(sa));
if (ret == 0) if (ret == 0)
break; break;
...@@ -553,7 +555,7 @@ int virFDStreamConnectUNIX(virStreamPtr st, ...@@ -553,7 +555,7 @@ int virFDStreamConnectUNIX(virStreamPtr st,
} }
goto error; goto error;
} while ((++i <= timeout*5) && (usleep(.2 * 1000000) <= 0)); }
if (virFDStreamOpenInternal(st, fd, NULL, -1, 0) < 0) if (virFDStreamOpenInternal(st, fd, NULL, -1, 0) < 0)
goto error; goto error;
......
...@@ -2359,6 +2359,8 @@ virThreadPoolSendJob; ...@@ -2359,6 +2359,8 @@ virThreadPoolSendJob;
# util/virtime.h # util/virtime.h
virTimeBackOffStart;
virTimeBackOffWait;
virTimeFieldsNow; virTimeFieldsNow;
virTimeFieldsNowRaw; virTimeFieldsNowRaw;
virTimeFieldsThen; virTimeFieldsThen;
......
...@@ -173,9 +173,8 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress) ...@@ -173,9 +173,8 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress)
{ {
struct sockaddr_un addr; struct sockaddr_un addr;
int monfd; int monfd;
int timeout = 3; /* In seconds */ virTimeBackOffVar timeout;
int ret; int ret = -1;
size_t i = 0;
*inProgress = false; *inProgress = false;
...@@ -207,7 +206,9 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress) ...@@ -207,7 +206,9 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress)
goto error; goto error;
} }
do { if (virTimeBackOffStart(&timeout, 1, 3*1000 /* ms */) < 0)
goto error;
while (virTimeBackOffWait(&timeout)) {
ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr));
if (ret == 0) if (ret == 0)
...@@ -232,7 +233,7 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress) ...@@ -232,7 +233,7 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress)
_("failed to connect to monitor socket")); _("failed to connect to monitor socket"));
goto error; goto error;
} while ((++i <= timeout*5) && (usleep(.2 * 1000000) <= 0)); }
if (ret != 0) { if (ret != 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include "virobject.h" #include "virobject.h"
#include "virprobe.h" #include "virprobe.h"
#include "virstring.h" #include "virstring.h"
#include "virtime.h"
#ifdef WITH_DTRACE_PROBES #ifdef WITH_DTRACE_PROBES
# include "libvirt_qemu_probes.h" # include "libvirt_qemu_probes.h"
...@@ -327,9 +328,8 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid) ...@@ -327,9 +328,8 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid)
{ {
struct sockaddr_un addr; struct sockaddr_un addr;
int monfd; int monfd;
int timeout = 30; /* In seconds */ virTimeBackOffVar timeout;
int ret; int ret = -1;
size_t i = 0;
if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
...@@ -345,7 +345,9 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid) ...@@ -345,7 +345,9 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid)
goto error; goto error;
} }
do { if (virTimeBackOffStart(&timeout, 1, 30*1000 /* ms */) < 0)
goto error;
while (virTimeBackOffWait(&timeout)) {
ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr));
if (ret == 0) if (ret == 0)
...@@ -362,7 +364,7 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid) ...@@ -362,7 +364,7 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid)
_("failed to connect to monitor socket")); _("failed to connect to monitor socket"));
goto error; goto error;
} while ((++i <= timeout*5) && (usleep(.2 * 1000000) <= 0)); }
if (ret != 0) { if (ret != 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
......
...@@ -34,14 +34,18 @@ ...@@ -34,14 +34,18 @@
#include <config.h> #include <config.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h>
#include <sys/time.h> #include <sys/time.h>
#include "virtime.h" #include "virtime.h"
#include "viralloc.h" #include "viralloc.h"
#include "virerror.h" #include "virerror.h"
#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_NONE #define VIR_FROM_THIS VIR_FROM_NONE
VIR_LOG_INIT("util.time");
/* We prefer clock_gettime if available because that is officially /* We prefer clock_gettime if available because that is officially
* async signal safe according to POSIX. Many platforms lack it * async signal safe according to POSIX. Many platforms lack it
* though, so fallback to gettimeofday everywhere else * though, so fallback to gettimeofday everywhere else
...@@ -363,3 +367,80 @@ virTimeLocalOffsetFromUTC(long *offset) ...@@ -363,3 +367,80 @@ virTimeLocalOffsetFromUTC(long *offset)
*offset = current - utc; *offset = current - utc;
return 0; return 0;
} }
/**
* virTimeBackOffStart:
* @var: Timeout variable (with type virTimeBackOffVar).
* @first: Initial time to wait (milliseconds).
* @timeout: Timeout (milliseconds).
*
* Initialize the timeout variable @var and start the timer running.
*
* Returns 0 on success, -1 on error and raises a libvirt error.
*/
int
virTimeBackOffStart(virTimeBackOffVar *var,
unsigned long long first, unsigned long long timeout)
{
if (virTimeMillisNow(&var->start_t) < 0)
return -1;
var->next = first;
var->limit_t = var->start_t + timeout;
return 0;
}
/**
* virTimeBackOffWait
* @var: Timeout variable (with type virTimeBackOffVar *).
*
* You must initialize @var first by calling the following function,
* which also starts the timer:
*
* if (virTimeBackOffStart(&var, first, timeout) < 0) {
* // handle errors
* }
*
* Then you use a while loop:
*
* while (virTimeBackOffWait(&var)) {
* //...
* }
*
* The while loop that runs the body of the code repeatedly, with an
* exponential backoff. It first waits for first milliseconds, then
* runs the body, then waits for 2*first ms, then runs the body again.
* Then 4*first ms, and so on.
*
* When timeout milliseconds is reached, the while loop ends.
*
* The body should use "break" or "goto" when whatever condition it is
* testing for succeeds (or there is an unrecoverable error).
*/
bool
virTimeBackOffWait(virTimeBackOffVar *var)
{
unsigned long long t, next;
ignore_value(virTimeMillisNowRaw(&t));
VIR_DEBUG("t=%llu, limit=%llu", t, var->limit_t);
if (t > var->limit_t)
return 0; /* ends the while loop */
next = var->next;
var->next *= 2;
/* If sleeping would take us beyond the limit, then shorten the
* sleep. This is so we always run the body just before the final
* timeout.
*/
if (t + next > var->limit_t)
next = var->limit_t - t;
VIR_DEBUG("sleeping for %llu ms", next);
usleep(next * 1000);
return 1;
}
...@@ -64,4 +64,15 @@ char *virTimeStringThen(unsigned long long when); ...@@ -64,4 +64,15 @@ char *virTimeStringThen(unsigned long long when);
int virTimeLocalOffsetFromUTC(long *offset) int virTimeLocalOffsetFromUTC(long *offset)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
typedef struct {
unsigned long long start_t;
unsigned long long next;
unsigned long long limit_t;
} virTimeBackOffVar;
int virTimeBackOffStart(virTimeBackOffVar *var,
unsigned long long first, unsigned long long timeout);
bool virTimeBackOffWait(virTimeBackOffVar *var);
#endif #endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册