| From 1f4a7a5837d9ecf665727a1ef31655032c97fb9c Mon Sep 17 00:00:00 2001 |
| From: Meena Shanmugam <meenashanmugam@google.com> |
| Date: Thu, 29 Jul 2021 22:22:19 +0000 |
| Subject: [PATCH] Disable keyed_hash feature in systemd-journald service. |
| |
| keyed_hash feature and zstd feature breaks stackdriver logging export as |
| stackdriver logging agent has older systemd(232). Until stackdriver |
| agent is upgraded, disable keyed hash feature. |
| --- |
| src/libsystemd/sd-journal/journal-file.c | 2 +- |
| units/systemd-journald.service.in | 1 + |
| 2 files changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in |
| index c743254..193c92e 100644 |
| --- a//units/systemd-journald.service.in |
| +++ b/units/systemd-journald.service.in |
| @@ -16,6 +16,7 @@ After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-a |
| Before=sysinit.target |
| |
| [Service] |
| +Environment=SYSTEMD_JOURNAL_KEYED_HASH=0 |
| DeviceAllow=char-* rw |
| ExecStart=@rootlibexecdir@/systemd-journald |
| FileDescriptorStoreMax=4224 |
| |
| diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c |
| index f8bb708..8ceb7e8 100644 |
| --- a/src/libsystemd/sd-journal/journal-file.c |
| +++ b/src/libsystemd/sd-journal/journal-file.c |
| @@ -3461,7 +3461,7 @@ int journal_file_open( |
| if (r < 0) { |
| if (r != -ENXIO) |
| log_debug_errno(r, "Failed to parse $SYSTEMD_JOURNAL_KEYED_HASH environment variable, ignoring."); |
| - f->keyed_hash = true; |
| + f->keyed_hash = false; |
| } else |
| f->keyed_hash = r; |
| |
| -- |
| 2.32.0.554.ge1b32706d8-goog |
| |