Merge branch 'master' of github.com:fluent/fluent-bit

fluent · May 8, 2019 · c845804 · c845804
2 parents 958bf5e + bafdab3
commit c845804
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 14 deletions.
diff --git a/plugins/in_systemd/systemd.c b/plugins/in_systemd/systemd.c
@@ -114,6 +114,9 @@ static int in_systemd_collect(struct flb_input_instance *i_ins,
      */
     if (ctx->pending_records == FLB_FALSE) {
         ret = sd_journal_process(ctx->j);
+        if (ret == SD_JOURNAL_INVALIDATE) {
+            flb_debug("[in_systemd] received event on added or removed journal file");
+        }
         if (ret != SD_JOURNAL_APPEND && ret != SD_JOURNAL_NOP) {
             return FLB_SYSTEMD_NONE;
         }
@@ -148,7 +151,9 @@ static int in_systemd_collect(struct flb_input_instance *i_ins,
         /* Set time */
         ret = sd_journal_get_realtime_usec(ctx->j, &usec);
         if (ret != 0) {
-            flb_error("[in_systemd] error reading from systemd journal. sd_journal_get_realtime_usec() return value '%s'", ret);
+            flb_error("[in_systemd] error reading from systemd journal. sd_journal_get_realtime_usec() return value '%i'", ret);
+            /* It seems the journal file was deleted (rotated). */
+            ret_j = -1;
             break;
         }
         sec = usec / 1000000;
@@ -196,7 +201,7 @@ static int in_systemd_collect(struct flb_input_instance *i_ins,
                entries < ctx->max_fields) {
             key = (char *) data;
             if (ctx->strip_underscores == FLB_TRUE && key[0] == '_') {
-                key++; 
+                key++;
                 length--;
             }
             sep = strchr(key, '=');
@@ -206,12 +211,15 @@ static int in_systemd_collect(struct flb_input_instance *i_ins,
 
             val = sep + 1;
             len = length - (sep - key) - 1;
-            msgpack_pack_str(&mp_pck,  len);
+            msgpack_pack_str(&mp_pck, len);
             msgpack_pack_str_body(&mp_pck, val, len);
 
             entries++;
         }
         rows++;
+        if (entries == ctx->max_fields) {
+            flb_debug("[in_systemd] max number of fields is reached: %i; all other fields are discarded", ctx->max_fields);
+        }
 
         /*
          * The fields were packed, now we need to adjust the msgpack map size
@@ -244,12 +252,10 @@ static int in_systemd_collect(struct flb_input_instance *i_ins,
             msgpack_sbuffer_init(&mp_sbuf);
             strncpy(last_tag, tag, tag_len);
             last_tag_len = tag_len;
-            ret_j = -1;
             break;
         }
 
         if (rows >= ctx->max_entries) {
-            ret_j = -1;
             break;
         }
     }
@@ -277,14 +283,27 @@ static int in_systemd_collect(struct flb_input_instance *i_ins,
         ctx->pending_records = FLB_FALSE;
         return FLB_SYSTEMD_OK;
     }
-
-    /*
-     * ret_j == -1, the loop was broken due to some special condition like
-     * buffer size limit or it reach the max number of rows that it supposed to
-     * process on this call. Assume there are pending records.
-     */
-    ctx->pending_records = FLB_TRUE;
-    return FLB_SYSTEMD_MORE;
+    else if (ret_j > 0) {
+        /*
+        * ret_j == 1, but the loop was broken due to some special condition like
+        * buffer size limit or it reach the max number of rows that it supposed to
+        * process on this call. Assume there are pending records.
+        */
+        ctx->pending_records = FLB_TRUE;
+        return FLB_SYSTEMD_MORE;
+    }
+    else {
+        /* Supposedly, current cursor points to a deleted file.
+         * Re-seeking to the first journal entry.
+         * Other failures, such as disk read error, would still lead to infinite loop there,
+         * but at least FLB log will be full of errors. */
+        ret = sd_journal_seek_head(ctx->j);
+        flb_error("[in_systemd] sd_journal_next() returned error %i; "
+            "journal is re-opened, unread logs are lost; "
+            "sd_journal_seek_head() returned %i", ret_j, ret);
+        ctx->pending_records = FLB_TRUE;
+        return FLB_SYSTEMD_ERROR;
+    }
 }
 
 static int in_systemd_collect_archive(struct flb_input_instance *i_ins,

diff --git a/plugins/in_systemd/systemd_config.c b/plugins/in_systemd/systemd_config.c
@@ -40,6 +40,7 @@ struct flb_systemd_config *flb_systemd_config_create(struct flb_input_instance *
     struct flb_config_prop *prop;
     struct flb_systemd_config *ctx;
     int journal_filter_is_and;
+    size_t size;
 
     /* Allocate space for the configuration */
     ctx = flb_calloc(1, sizeof(struct flb_systemd_config));
@@ -208,6 +209,10 @@ struct flb_systemd_config *flb_systemd_config_create(struct flb_input_instance *
         ctx->strip_underscores = FLB_FALSE;
     }
 
+    sd_journal_get_data_threshold(ctx->j, &size);
+    flb_debug("[in_systemd] sd_journal library may truncate values "
+        "to sd_journal_get_data_threshold() bytes: %i", size);
+
     return ctx;
 }
 

diff --git a/plugins/in_systemd/systemd_config.h b/plugins/in_systemd/systemd_config.h
@@ -28,6 +28,7 @@
 #include <systemd/sd-journal.h>
 
 /* return values */
+#define FLB_SYSTEMD_ERROR   -1 /* Systemd journal file read error. */
 #define FLB_SYSTEMD_NONE     0
 #define FLB_SYSTEMD_OK       1
 #define FLB_SYSTEMD_MORE     2

diff --git a/plugins/out_stackdriver/gce_metadata.h b/plugins/out_stackdriver/gce_metadata.h
@@ -23,7 +23,7 @@
 #include "stackdriver.h"
 
 /* Project ID metadata URI */
-#define FLB_STD_METADATA_PROJECT_ID_URI "computeMetadata/v1/project/numeric-project-id"
+#define FLB_STD_METADATA_PROJECT_ID_URI "/computeMetadata/v1/project/numeric-project-id"
 
 /* Zone metadata URI */
 #define FLB_STD_METADATA_ZONE_URI "/computeMetadata/v1/instance/zone"