File libxl.LIBXL_DESTROY_TIMEOUT.debug.patch of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File libxl.LIBXL_DESTROY_TIMEOUT.debug.patch of Package xen (Revision 44120161504de8f3935a58cc6bbc9beb)

Currently displaying revision 44120161504de8f3935a58cc6bbc9beb , Show latest

bsc#1035442
the default value of LIBXL_DESTROY_TIMEOUT is too low when many domUs shutdown in parallel
track how much time passes between triggering XenbusStateClosing and XenbusStateClosed
Index: xen-4.10.0-testing/tools/libxl/libxl_event.c
===================================================================
--- xen-4.10.0-testing.orig/tools/libxl/libxl_event.c
+++ xen-4.10.0-testing/tools/libxl/libxl_event.c
@@ -16,6 +16,7 @@
  */
 
 #include <poll.h>
+#include <time.h>
 
 #include "libxl_internal.h"
 
@@ -846,6 +847,22 @@ void libxl__ev_evtchn_cancel(libxl__gc *
     evtchn_check_fd_deregister(gc);
 }
 
+static void diff_timespec(const struct timespec *old, char *b, size_t s)
+{
+    struct timespec new, diff;
+
+    if (old->tv_sec == 0 || clock_gettime(CLOCK_MONOTONIC, &new))
+        new = *old;
+    if ((new.tv_nsec - old->tv_nsec) < 0) {
+        diff.tv_sec = new.tv_sec - old->tv_sec - 1;
+        diff.tv_nsec = new.tv_nsec - old->tv_nsec + 1000000000;
+    } else {
+        diff.tv_sec = new.tv_sec - old->tv_sec;
+        diff.tv_nsec = new.tv_nsec - old->tv_nsec;
+    }
+    snprintf(b, s, "bug#1035442: %ld.%09lds", (long)diff.tv_sec, diff.tv_nsec);
+}
+
 /*
  * waiting for device state
  */
@@ -855,27 +872,29 @@ static void devstate_callback(libxl__egc
 {
     EGC_GC;
     libxl__ev_devstate *ds = CONTAINER_OF(xsw, *ds, w);
+    char b[64];
+    diff_timespec(&ds->w.start, b, sizeof(b));
 
     if (rc) {
         if (rc == ERROR_TIMEDOUT)
-            LOG(DEBUG, "backend %s wanted state %d "" timed out", ds->w.path,
-                ds->wanted);
+            LOG(DEBUG, "backend %s wanted state %d "" timed out (%s)", ds->w.path,
+                ds->wanted, b);
         goto out;
     }
     if (!sstate) {
-        LOG(DEBUG, "backend %s wanted state %d"" but it was removed",
-            ds->w.path, ds->wanted);
+        LOG(DEBUG, "backend %s wanted state %d"" but it was removed (%s)",
+            ds->w.path, ds->wanted, b);
         rc = ERROR_INVAL;
         goto out;
     }
 
     int got = atoi(sstate);
     if (got == ds->wanted) {
-        LOG(DEBUG, "backend %s wanted state %d ok", ds->w.path, ds->wanted);
+        LOG(DEBUG, "backend %s wanted state %d ok (%s)", ds->w.path, ds->wanted, b);
         rc = 0;
     } else {
-        LOG(DEBUG, "backend %s wanted state %d"" still waiting state %d",
-            ds->w.path, ds->wanted, got);
+        LOG(DEBUG, "backend %s wanted state %d"" still waiting state %d (%s)",
+            ds->w.path, ds->wanted, got, b);
         return;
     }
 
@@ -901,6 +920,8 @@ int libxl__ev_devstate_wait(libxl__ao *a
     ds->w.path = state_path;
     ds->w.timeout_ms = milliseconds;
     ds->w.callback = devstate_callback;
+    rc = clock_gettime(CLOCK_MONOTONIC, &ds->w.start);
+    if (rc) goto out;
     rc = libxl__xswait_start(gc, &ds->w);
     if (rc) goto out;
 
Index: xen-4.10.0-testing/tools/libxl/libxl_internal.h
===================================================================
--- xen-4.10.0-testing.orig/tools/libxl/libxl_internal.h
+++ xen-4.10.0-testing/tools/libxl/libxl_internal.h
@@ -1303,6 +1303,7 @@ struct libxl__xswait_state {
     const char *what; /* for error msgs: noun phrase, what we're waiting for */
     const char *path;
     int timeout_ms; /* as for poll(2) */
+    struct timespec start;
     libxl__xswait_callback *callback;
     /* remaining fields are private to xswait */
     libxl__ev_time time_ev;

Places

File libxl.LIBXL_DESTROY_TIMEOUT.debug.patch of Package xen (Revision 44120161504de8f3935a58cc6bbc9beb)

Places