WIP

Signed-off-by: Eduardo Silva <[email protected]>

Author: edsiper

CHUNKS.md

@@ -91,6 +91,36 @@ Content Data <       |  |  records  |  |
 Fluent Bit API provides backward compatibility with the previous metadata and content
 format found on series v1.8.
 
+Starting with the Fluent Bit release that introduces direct route persistence, the
+fourth metadata byte now carries feature flags. A zero value preserves the legacy
+layout, while a non-zero value indicates that additional structures follow the tag.
+When the ``FLB_CHUNK_FLAG_DIRECT_ROUTES`` bit is set the tag is terminated with a
+single ``\0`` byte and a routing payload is appended:
+
+```
+Metadata
+                --   +---------+-------+
+               /     |  0xF1   | 0x77  |  <- Magic Bytes
+              /      +---------+-------+
+             <       |  Type   | Flags |  <- Chunk type and flag bits
+              \      +---------+-------+
+               \     |      Tag        |  <- Tag string (no size prefix)
+                     +---------+-------+
+                     |  0x00   |       |  <- Tag terminator (present when flags != 0)
+                     +---------+-------+
+                     | Routing Length  |  <- uint16_t big endian
+                     +---------+-------+
+                     | Route Count     |  <- uint16_t big endian
+                     +---------+-------+
+                     | Output IDs ...  |  <- Each stored as uint8_t
+                --   +-----------------+
+```
+
+The routing payload captures the direct route mapping so that filesystem chunks
+loaded by the storage backlog re-use the same outputs after a restart. Chunks
+without direct routes keep the legacy layout (flags byte set to zero) and remain
+fully backwards compatible across Fluent Bit versions.
+
 ### Fluent Bit <= v1.8
 
 Up to Fluent Bit <= 1.8.x, the metadata and content data is simple, where metadata

include/fluent-bit/flb_input_chunk.h

@@ -25,6 +25,8 @@
 #include <fluent-bit/flb_config.h>
 #include <fluent-bit/flb_routes_mask.h>
 
+struct cio_chunk;
+
 #include <monkey/mk_core.h>
 #include <msgpack.h>
 
@@ -42,6 +44,9 @@
 /* Number of bytes reserved for Metadata Header on Chunks */
 #define FLB_INPUT_CHUNK_META_HEADER   4
 
+/* Chunk metadata flags */
+#define FLB_CHUNK_FLAG_DIRECT_ROUTES   (1 << 0)
+
 /* Chunks magic bytes (starting from Fluent Bit v1.8.10) */
 #define FLB_INPUT_CHUNK_MAGIC_BYTE_0  (unsigned char) 0xF1
 #define FLB_INPUT_CHUNK_MAGIC_BYTE_1  (unsigned char) 0x77
@@ -110,6 +115,15 @@ int flb_input_chunk_get_event_type(struct flb_input_chunk *ic);
 int flb_input_chunk_get_tag(struct flb_input_chunk *ic,
                             const char **tag_buf, int *tag_len);
 
+int flb_input_chunk_write_header_v2(struct cio_chunk *chunk,
+                                    int event_type,
+                                    char *tag, int tag_len,
+                                    uint8_t *output_ids, int route_count);
+int flb_input_chunk_has_direct_routes(struct flb_input_chunk *ic);
+int flb_input_chunk_get_direct_routes(struct flb_input_chunk *ic,
+                                      uint8_t **output_ids,
+                                      int *route_count);
+
 void flb_input_chunk_ring_buffer_cleanup(struct flb_input_instance *ins);
 void flb_input_chunk_ring_buffer_collector(struct flb_config *ctx, void *data);
 ssize_t flb_input_chunk_get_size(struct flb_input_chunk *ic);

lib/chunkio/src/cio_file.c

@@ -1106,7 +1106,7 @@ int cio_file_write_metadata(struct cio_chunk *ch, char *buf, size_t size)
     /* set new position for the content data */
     cur_content_data = cio_file_st_get_content(cf->map);
     new_content_data = meta + size;
-    memmove(new_content_data, cur_content_data, size);
+    memmove(new_content_data, cur_content_data, cf->data_size);
 
     /* copy new metadata */
     memcpy(meta, buf, size);