From 7f39ccca7145aff29171eb7fb906c2c52174f893 Mon Sep 17 00:00:00 2001 From: Watson Date: Mon, 9 Dec 2024 10:38:00 +0900 Subject: [PATCH] ci: add test to check the service status with updating from v4 (#755) This PR will add test to confirm that fluentd should be restarted with updating from v4 --------- Signed-off-by: Shizuo Fujita Co-authored-by: Daijiro Fukuda --- fluent-package/apt/systemd-test/update-from-v4.sh | 9 +++++++++ fluent-package/yum/systemd-test/update-from-v4.sh | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/fluent-package/apt/systemd-test/update-from-v4.sh b/fluent-package/apt/systemd-test/update-from-v4.sh index c2c0f8f2..748a9b0a 100755 --- a/fluent-package/apt/systemd-test/update-from-v4.sh +++ b/fluent-package/apt/systemd-test/update-from-v4.sh @@ -9,6 +9,7 @@ sudo apt install -y curl ca-certificates curl -fsSL https://toolbelt.treasuredata.com/sh/install-${distribution}-${code_name}-td-agent4.sh | sh systemctl status --no-pager td-agent +main_pid=$(eval $(systemctl show td-agent --property=MainPID) && echo $MainPID) # Generate garbage files touch /etc/td-agent/a\ b\ c @@ -18,6 +19,11 @@ for d in $(seq 1 10); do touch /var/log/td-agent/$d.log done +# When it updates from v4, the service needs to be stopped to restart fluentd after installation. +# Note: This behavior is not expected, and maybe it should be fixed. +# The cause is unknown. For deb, usually, restart should happen when the service was active before the update. +sudo systemctl stop td-agent + # Install the current case $1 in local) @@ -49,6 +55,9 @@ esac systemctl status --no-pager fluentd systemctl status --no-pager td-agent +# Fluentd should be restarted when update from v4. +test $main_pid -ne $(eval $(systemctl show fluentd --property=MainPID) && echo $MainPID) + # Test: restoring td-agent service alias sudo systemctl stop fluentd sudo systemctl unmask td-agent diff --git a/fluent-package/yum/systemd-test/update-from-v4.sh b/fluent-package/yum/systemd-test/update-from-v4.sh index 39626673..e7697602 100755 --- a/fluent-package/yum/systemd-test/update-from-v4.sh +++ b/fluent-package/yum/systemd-test/update-from-v4.sh @@ -19,6 +19,7 @@ sudo $DNF install -y td-agent-${td_agent_version}-1.*.x86_64 sudo systemctl enable --now td-agent systemctl status --no-pager td-agent +main_pid=$(eval $(systemctl show td-agent --property=MainPID) && echo $MainPID) # Generate garbage files touch /etc/td-agent/a\ b\ c @@ -40,6 +41,9 @@ systemctl status --no-pager fluentd # Migration process starts the service autom sudo systemctl enable fluentd # Enable the unit name alias systemctl status --no-pager td-agent +# Fluentd should be restarted when update from v4. +test $main_pid -ne $(eval $(systemctl show fluentd --property=MainPID) && echo $MainPID) + # Test: config migration test -h /etc/td-agent test -h /etc/fluent/fluentd.conf