storage: Restore status of chunks for error paths

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

Author: cosmo0920

src/flb_storage.c

@@ -802,6 +802,17 @@ static struct cio_stream *get_or_create_rejected_stream(struct flb_config *ctx)
 #endif
 }
 
+static inline int flb_storage_chunk_restore_state(struct cio_chunk *src, int was_up, int ret_val)
+{
+    if (!was_up) {
+        if (cio_chunk_down(src) != CIO_OK) {
+            flb_debug("[storage] failed to bring chunk back down");
+        }
+    }
+
+    return ret_val;
+}
+
 int flb_storage_quarantine_chunk(struct flb_config *ctx,
                                  struct cio_chunk *src,
                                  const char *tag,
@@ -846,37 +857,30 @@ int flb_storage_quarantine_chunk(struct flb_config *ctx,
 
     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;
+        return flb_storage_chunk_restore_state(src, was_up, -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;
+        return flb_storage_chunk_restore_state(src, was_up, -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;
+        return flb_storage_chunk_restore_state(src, was_up, -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");
-        }
-    }
-
-    return 0;
+    return flb_storage_chunk_restore_state(src, was_up, 0);
 #else
     FLB_UNUSED(ctx);
     FLB_UNUSED(src);