Skip to content

Commit

Permalink
Use latest systemd-journal
Browse files Browse the repository at this point in the history
There is known bug that systemd-journal 1.4.2 or older version
doesn't work with custom memory allocator such as jemalloc because of
inappropriate allocated memory handling.
As a result, it causes a SEGV. This bug was frequently reported from
fluent-docker-image and fluentd-kubernetes-daemonset images users. [1]

[1] fluent/fluentd-docker-image#378

Recently, this bug was fixed [2] and released as systemd-journal 2.0.0.
Now we should switch to it.

[2] ledbettj/systemd-journal#97

NOTE: systemd-journal requires Ruby 3.0.0 or later, so need to bump
base image version which provides Ruby 3.x - so use ubuntu:jammy for
testing.

Signed-off-by: Kentaro Hayashi <[email protected]>
  • Loading branch information
kenhys committed Sep 11, 2024
1 parent 55a87fa commit 733ac6c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion fluent-plugin-systemd.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'rubocop', '1.13.0'

spec.add_runtime_dependency 'fluentd', ['>= 0.14.11', '< 2']
spec.add_runtime_dependency 'systemd-journal', '~> 1.4.2'
spec.add_runtime_dependency 'systemd-journal', '~> 2.0.0'
end
4 changes: 2 additions & 2 deletions test/docker/Dockerfile.tdagent-ubuntu
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal
FROM ubuntu:jammy

RUN apt-get update -q \
&& apt-get install -qy --no-install-recommends \
Expand All @@ -8,7 +8,7 @@ RUN apt-get update -q \
gnupg \
libsystemd0 \
&& curl https://packages.treasuredata.com/GPG-KEY-td-agent | apt-key add - \
&& echo "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib" > /etc/apt/sources.list.d/treasure-data.list \
&& echo "deb http://packages.treasuredata.com/4/ubuntu/jammy/ jammy contrib" > /etc/apt/sources.list.d/treasure-data.list \
&& apt-get update \
&& apt-get install -y td-agent \
&& apt-get clean \
Expand Down
2 changes: 1 addition & 1 deletion test/docker/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal
FROM ubuntu:jammy

RUN apt-get update -q && apt-get install -qy --no-install-recommends \
build-essential \
Expand Down

0 comments on commit 733ac6c

Please sign in to comment.