Skip to content

Commit 733ac6c

Browse files
committed
Use latest systemd-journal
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]>
1 parent 55a87fa commit 733ac6c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

fluent-plugin-systemd.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
2424
spec.add_development_dependency 'rubocop', '1.13.0'
2525

2626
spec.add_runtime_dependency 'fluentd', ['>= 0.14.11', '< 2']
27-
spec.add_runtime_dependency 'systemd-journal', '~> 1.4.2'
27+
spec.add_runtime_dependency 'systemd-journal', '~> 2.0.0'
2828
end

test/docker/Dockerfile.tdagent-ubuntu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:focal
1+
FROM ubuntu:jammy
22

33
RUN apt-get update -q \
44
&& apt-get install -qy --no-install-recommends \
@@ -8,7 +8,7 @@ RUN apt-get update -q \
88
gnupg \
99
libsystemd0 \
1010
&& curl https://packages.treasuredata.com/GPG-KEY-td-agent | apt-key add - \
11-
&& echo "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib" > /etc/apt/sources.list.d/treasure-data.list \
11+
&& echo "deb http://packages.treasuredata.com/4/ubuntu/jammy/ jammy contrib" > /etc/apt/sources.list.d/treasure-data.list \
1212
&& apt-get update \
1313
&& apt-get install -y td-agent \
1414
&& apt-get clean \

test/docker/Dockerfile.ubuntu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:focal
1+
FROM ubuntu:jammy
22

33
RUN apt-get update -q && apt-get install -qy --no-install-recommends \
44
build-essential \

0 commit comments

Comments
 (0)