1 files changed, 13 insertions, 0 deletions
diff --git a/src/vat/main.c b/src/vat/main.c
index 1bad2ebb14d..b8856cc9fa3 100644
--- a/src/vat/main.c
+++ b/src/vat/main.c
@@ -297,6 +297,7 @@ main (int argc, char **argv)
   u8 *heap;
   mheap_t *h;
   int i;
+  f64 timeout;
 
   clib_mem_init (0, 128 << 20);
 
@@ -408,6 +409,18 @@ main (int argc, char **argv)
       fclose (vam->ifp);
     }
 
+  /*
+   * Particularly when running a script, don't be in a hurry to leave.
+   * A reply message queued to this process will end up constipating
+   * the allocation rings.
+   */
+  timeout = vat_time_now (vam) + 2.0;
+  while (vam->result_ready == 0 && vat_time_now (vam) < timeout)
+    ;
+
+  if (vat_time_now (vam) > timeout)
+    clib_warning ("BUG: message reply spin-wait timeout");
+
   vl_client_disconnect_from_vlib ();
   exit (0);
 }