Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fluent/fluentd
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.16.3
Choose a base ref
...
head repository: fluent/fluentd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.16.4
Choose a head ref
  • 16 commits
  • 14 files changed
  • 4 contributors

Commits on Dec 14, 2023

  1. buffer: Avoid to process discarded chunks in write_step_by_step (for …

    …v1.16) (#4363)
    
    It fixes following error when many `chunk bytes limit exceeds` errors
    are occurred:
    ```
    2020-07-28 14:59:26 +0000 [warn]: #0 emit transaction failed: error_class=IOError error="closed stream" location="/fluentd/vendor/bundle/ruby/2.6.0/gems/fluentd-1.11.1/lib/fluent/plugin/buffer/file_chunk.rb:82:in `pos'" tag="cafiscode-eks-cluster.default"
      2020-07-28 14:59:26 +0000 [warn]: #0 /fluentd/vendor/bundle/ruby/2.6.0/gems/fluentd-1.11.1/lib/fluent/plugin/buffer/file_chunk.rb:82:in `pos'
      2020-07-28 14:59:26 +0000 [warn]: #0 /fluentd/vendor/bundle/ruby/2.6.0/gems/fluentd-1.11.1/lib/fluent/plugin/buffer/file_chunk.rb:82:in `rollback'
      2020-07-28 14:59:26 +0000 [warn]: #0 /fluentd/vendor/bundle/ruby/2.6.0/gems/fluentd-1.11.1/lib/fluent/plugin/buffer.rb:339:in `rescue in block in write'
      2020-07-28 14:59:26 +0000 [warn]: #0 /fluentd/vendor/bundle/ruby/2.6.0/gems/fluentd-1.11.1/lib/fluent/plugin/buffer.rb:332:in `block in write'
      2020-07-28 14:59:26 +0000 [warn]: #0 /fluentd/vendor/bundle/ruby/2.6.0/gems/fluentd-1.11.1/lib/fluent/plugin/buffer.rb:331:in `each'
      ...
    ```
    
    Fix #3089
    
    Signed-off-by: Takuro Ashie <[email protected]>
    ashie authored Dec 14, 2023
    Configuration menu
    Copy the full SHA
    e2d7885 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. buffer: Avoid calling dump_unique_id_hex if log level is not trace

    Signed-off-by: Christian Norbert Menges <[email protected]>
    Garfield96 authored and daipom committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    b47181b View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Merge pull request #4397 from fluent/v1.16-backport-4331

    Backport (v1.16): buffer: Avoid calling dump_unique_id_hex if log level is not trace
    ashie authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    5ee04f0 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. in_tail: Manage tail watchers that are rorate_wait state too (#4334)

    After a tail watcher transitions to `rotate_wait` state, the
    `rotate_wait` timer is no longer managed by in_tail, it might cause
    unexpected behaviour. e.g.)
    
    * It's never unwatched when shutdown occurs before `rotate_wait` passed.
    * Needless `rotate_wait` timers are executed when it detects more
      rotations.
    
    This patch fixes such unexpected behaviour.
    
    Note: The comment about `detach_watcher` was added in 76f246a.
    At that time, closing was done by event-loop.
    Now, the situation is completely different, so it should be removed.
    
    ---------
    
    Signed-off-by: Takuro Ashie <[email protected]>
    Co-authored-by: Daijiro Fukuda <[email protected]>
    ashie and daipom committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    4372698 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. Merge pull request #4427 from fluent/v1.16-backport-4334

    Backport (v1.16): in_tail: Manage tail watchers that are `rorate_wait` state too (#4334)
    ashie authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    0d2cd95 View commit details
    Browse the repository at this point in the history
  2. Refine CI (#4380)

    Refine CI settings:
    
    * Unify CI settings for each platforms to one file
    * Don't run CI for Ruby head on each push/pull_request event
        * Because Ruby head is continually changed and not released
          yet, running CI one shot isn't so meaningful.
        * Instead run it regularly on every Sunday.
    * Add TESTOPT=-v to all platfroms
        * It's useful to investigate when a test is stalled.
    * Remove a hack for Ruby 3.0 on Windows
        * It seems no longer needed.
    
    Signed-off-by: Takuro Ashie <[email protected]>
    ashie authored and daipom committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    7b7116c View commit details
    Browse the repository at this point in the history
  3. CI: Remove scheduled tests for Ruby head

    because Ruby head is never supported on v1.16, and it seems wrong
    to use schedule trigger outside of the default branch (master).
    
    Signed-off-by: Daijiro Fukuda <[email protected]>
    Co-authored-by: Takuro Ashie <[email protected]>
    daipom and ashie committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    a834192 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #4428 from fluent/v1.16-backport-4380

    Backport (v1.16): Refine CI (#4380)
    ashie authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    30602a5 View commit details
    Browse the repository at this point in the history
  5. test: Check Socket::ResolutionError instead of SocketError on Ruby 3.3

    Signed-off-by: Takuro Ashie <[email protected]>
    ashie authored and daipom committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    7f84eae View commit details
    Browse the repository at this point in the history
  6. test_child_process: Replace some UTF-8 byte sequences with named vari…

    …ables
    
    Make easy to understand what these tests do.
    
    Signed-off-by: Takuro Ashie <[email protected]>
    ashie authored and daipom committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    1a7ad12 View commit details
    Browse the repository at this point in the history
  7. test_child_process: Mark scrubbing tests as pending

    Behaviour of `IO#set_encoding` has been changed as of Ruby 3.3.
    We don't yet determine how to solve this issue, it might be better to
    address in Ruby.
    
    Signed-off-by: Takuro Ashie <[email protected]>
    ashie authored and daipom committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    9796fd3 View commit details
    Browse the repository at this point in the history
  8. test_fluentd: Fix failed tests on Ruby 3.3

    Signed-off-by: Takuro Ashie <[email protected]>
    ashie authored and daipom committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    48c2b05 View commit details
    Browse the repository at this point in the history
  9. github: unify YAML file extension to .yml (#4431)

    Backported form 2ea28c9
    
    ---
    
    It is not harmful because GitHub allows both of file extensions (.yaml
    and .yml), but it may be better to unify it for consistency.
    
    .yml is used in https://docs.github.com/en/actions/learn-github-actions/understanding-github-actions
    
    Signed-off-by: Kentaro Hayashi <[email protected]>
    daipom authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    3b93711 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #4430 from fluent/v1.16-backport-4375

    Backport (v1.16):  Fix or suppress failed tests on Ruby 3.3 (#4375)
    ashie authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    00aec89 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. CI: Fix unstable tests of out_forward (#4436)

    Backported from 5d18f35
    
    * Avoid calling `instance_start` in duplicate.
    * Avoid not calling `instance_shutdown`.
    
    To fix the following error, which sometimes occur.
    I'm not sure this actually fixes it, but, at least, we should fix the
    points above.
    
        Error: test: Create new connection per send_data(ForwardOutputTest): ArgumentError: expected loop to be an instance of Coolio::Loop, not nil
        C:/hostedtoolcache/windows/Ruby/3.2.3/x64/lib/ruby/gems/3.2.0/gems/cool.io-1.8.0/lib/cool.io/io.rb:35:in `attach'
        C:/hostedtoolcache/windows/Ruby/3.2.3/x64/lib/ruby/gems/3.2.0/gems/cool.io-1.8.0/lib/cool.io/io.rb:35:in `attach'
        C:/hostedtoolcache/windows/Ruby/3.2.3/x64/lib/ruby/gems/3.2.0/gems/cool.io-1.8.0/lib/cool.io/socket.rb:39:in `attach'
        (eval):7:in `attach'
        C:/hostedtoolcache/windows/Ruby/3.2.3/x64/lib/ruby/gems/3.2.0/gems/cool.io-1.8.0/lib/cool.io/server.rb:40:in `on_connection'
        C:/hostedtoolcache/windows/Ruby/3.2.3/x64/lib/ruby/gems/3.2.0/gems/cool.io-1.8.0/lib/cool.io/listener.rb:65:in `on_readable'
        C:/hostedtoolcache/windows/Ruby/3.2.3/x64/lib/ruby/gems/3.2.0/gems/cool.io-1.8.0/lib/cool.io/loop.rb:88:in `run_once'
        C:/hostedtoolcache/windows/Ruby/3.2.3/x64/lib/ruby/gems/3.2.0/gems/cool.io-1.8.0/lib/cool.io/loop.rb:88:in `run'
        D:/a/fluentd/fluentd/lib/fluent/plugin_helper/event_loop.rb:93:in `block in start'
        D:/a/fluentd/fluentd/lib/fluent/plugin_helper/thread.rb:78:in `block in thread_create'
    
    Signed-off-by: Daijiro Fukuda <[email protected]>
    Co-authored-by: Takuro Ashie <[email protected]>
    daipom and ashie authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    e668920 View commit details
    Browse the repository at this point in the history
  2. v1.16.4

    Signed-off-by: Kentaro Hayashi <[email protected]>
    Signed-off-by: Daijiro Fukuda <[email protected]>
    Co-authored-by: Kentaro Hayashi <[email protected]>
    kenhys authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    1ffa714 View commit details
    Browse the repository at this point in the history
Loading