storage: Restore status of chunks for error paths

Signed-off-by: Hiroshi Hatake <[email protected]>

Author: cosmo0920

src/flb_storage.c

@@ -844,37 +844,41 @@ int flb_storage_quarantine_chunk(struct flb_config *ctx,
              "%s_%d_%s_%p.flb",
              safe_tag, status_code, safe_out, (void *) src);
 
+    /* Helper to restore state if we changed it */
+    #define CHUNK_RESTORE_AND_RETURN(ret_val) do { \
+        if (!was_up && cio_chunk_down(src) != CIO_OK) { \
+            flb_debug("[storage] failed to bring chunk back down"); \
+        } \
+        return (ret_val); \
+    } while(0)
+
     if (cio_chunk_get_content_copy(src, &buf, &size) != CIO_OK || size == 0) {
         flb_warn("[storage] cannot read content for DLQ copy (size=%zu)", size);
-        return -1;
+        CHUNK_RESTORE_AND_RETURN(-1);
     }
 
     /* Create + write the DLQ copy */
     dst = cio_chunk_open(ctx->cio, dlq, name, CIO_OPEN, size, &err);
     if (!dst) {
         flb_warn("[storage] DLQ open failed (err=%d)", err);
         flb_free(buf);
-        return -1;
+        CHUNK_RESTORE_AND_RETURN(-1);
     }
     if (cio_chunk_write(dst, buf, size) != CIO_OK ||
         cio_chunk_sync(dst) != CIO_OK) {
         flb_warn("[storage] DLQ write/sync failed");
         cio_chunk_close(dst, CIO_TRUE);
         flb_free(buf);
-        return -1;
+        CHUNK_RESTORE_AND_RETURN(-1);
     }
 
     cio_chunk_close(dst, CIO_FALSE);
     flb_free(buf);
 
     flb_info("[storage] quarantined rejected chunk into DLQ stream (bytes=%zu)", size);
 
-    /* Restore original state if we brought the chunk up */
-    if (!was_up) {
-        if (cio_chunk_down(src) != CIO_OK) {
-            flb_debug("[storage] failed to bring chunk back down after DLQ copy");
-        }
-    }
+    CHUNK_RESTORE_AND_RETURN(0);
+    #undef CHUNK_RESTORE_AND_RETURN
 
     return 0;
 #else