out_s3: Address revire comments

Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>

Author: cosmo0920

plugins/out_s3/s3.c

@@ -100,21 +100,21 @@ static struct flb_aws_header *get_content_encoding_header(int compression_type)
         .val = "gzip",
         .val_len = 4,
     };
-    
+
     static struct flb_aws_header zstd_header = {
         .key = "Content-Encoding",
         .key_len = 16,
         .val = "zstd",
         .val_len = 4,
     };
-    
+
     static struct flb_aws_header snappy_header = {
         .key = "Content-Encoding",
         .key_len = 16,
         .val = "snappy",
         .val_len = 6,
     };
-    
+
     switch (compression_type) {
         case FLB_AWS_COMPRESS_GZIP:
             return &gzip_header;
@@ -199,7 +199,7 @@ int create_headers(struct flb_s3 *ctx, char *body_md5,
     if (ctx->content_type != NULL) {
         headers_len++;
     }
-    if (ctx->compression == FLB_AWS_COMPRESS_GZIP || 
+    if (ctx->compression == FLB_AWS_COMPRESS_GZIP ||
         ctx->compression == FLB_AWS_COMPRESS_ZSTD ||
         ctx->compression == FLB_AWS_COMPRESS_SNAPPY) {
         headers_len++;
@@ -231,7 +231,7 @@ int create_headers(struct flb_s3 *ctx, char *body_md5,
         s3_headers[n].val_len = strlen(ctx->content_type);
         n++;
     }
-    if (ctx->compression == FLB_AWS_COMPRESS_GZIP || 
+    if (ctx->compression == FLB_AWS_COMPRESS_GZIP ||
         ctx->compression == FLB_AWS_COMPRESS_ZSTD ||
         ctx->compression == FLB_AWS_COMPRESS_SNAPPY) {
         encoding_header = get_content_encoding_header(ctx->compression);
@@ -847,7 +847,7 @@ static int cb_s3_init(struct flb_output_instance *ins,
                          "total_file_size is less than 10 MB, will use PutObject API");
             ctx->use_put_object = FLB_TRUE;
     }
-    
+
     if (ctx->use_put_object == FLB_FALSE) {
         /* upload_chunk_size */
         if (ctx->upload_chunk_size <= 0) {
@@ -1987,7 +1987,8 @@ static void s3_chunk_retry_exhausted_cleanup(struct flb_s3 *ctx,
         ret = s3_store_file_inactive(ctx, chunk_file);
         if (ret < 0) {
             flb_plg_error(ctx->ins,
-                          "could not quarantine retry-exhausted chunk");
+                          "could not quarantine, deleting retry-exhausted chunk");
+            s3_store_file_delete(ctx, chunk_file);
             return;
         }
 

plugins/out_s3/s3_store.c

@@ -215,6 +215,7 @@ static int set_files_context(struct flb_s3 *ctx)
     struct flb_fstore_stream *fs_stream;
     struct flb_fstore_file *fsf;
     struct s3_file *s3_file;
+    ssize_t file_size;
 
     mk_list_foreach(head, &ctx->fs->streams) {
         fs_stream = mk_list_entry(head, struct flb_fstore_stream, _head);
@@ -246,6 +247,11 @@ static int set_files_context(struct flb_s3 *ctx)
             s3_file->first_log_time = time(NULL);
             s3_file->create_time = time(NULL);
 
+            file_size = cio_chunk_get_real_size(fsf->chunk);
+            if (file_size > 0) {
+                s3_file->size = (size_t) file_size;
+            }
+
             /* Use fstore opaque 'data' reference to keep our context */
             fsf->data = s3_file;
         }