Don't re-run garbage collection

`fr_control_message_alloc()` already attempts garbage collection if
allocation from the ring buffer fails, so trying again like this will
potentially result in 3 calls to `fr_control_gc()` when the buffer is
full.

diff --git a/src/lib/io/control.c b/src/lib/io/control.c
index c387efb94255d8a83aedfcd14f2a6a06419e6064..8653e50db33a73173dabb2a91510541bb0961ee0 100644 (file)
--- a/src/lib/io/control.c
+++ b/src/lib/io/control.c
@@ -304,18 +304,13 @@ int fr_control_message_push(fr_control_t *c, fr_ring_buffer_t *rb, uint32_t id,
        MPRINT("CONTROL push aq %p\n", c->aq);
 
        /*
-        *      Get a message.  If we can't get one, do garbage
-        *      collection.  Get another, and if that fails, we're
-        *      done.
+        *      Get a message.  The alloc call attempts garbage collection
+        *      if there is not enough free space.
         */
        m = fr_control_message_alloc(c, rb, id, data, data_size);
        if (!m) {
-               (void) fr_control_gc(c, rb);
-               m = fr_control_message_alloc(c, rb, id, data, data_size);
-               if (!m) {
-                       fr_strerror_const("Failed allocating after GC");
-                       return -2;
-               }
+               fr_strerror_const("Failed allocating after GC");
+               return -2;
        }
 
        if (!fr_atomic_queue_push(c->aq, m)) {