Skip to content

systemd: Use restart counter to determine if service is started #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bastelfreak wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

systemd: Use restart counter to determine if service is started #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions resources/puppetlabs/lein-ezbake/staging-templates/ezbake.rb.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ module EZBake
:additional_postinst => {{{debian-postinst}}},
:additional_postinst_install => {{{debian-postinst-install}}},
:additional_install => {{{debian-install}}},
:pre_start_action => {{{debian-pre-start-action}}},
:post_start_action => {{{debian-post-start-action}}},
:interested_install_triggers => {
{{#debian-interested-install-triggers}}
{{{interest-name}}} => [{{{scripts}}}],
Expand All @@ -57,8 +55,6 @@ module EZBake
:additional_postinst => {{{redhat-postinst}}},
:additional_postinst_install => {{{redhat-postinst-install}}},
:additional_install => {{{redhat-install}}},
:pre_start_action => {{{redhat-pre-start-action}}},
:post_start_action => {{{redhat-post-start-action}}},
:postinst_install_triggers => {
{{#redhat-postinst-install-triggers}}
{{{package}}} => [{{{scripts}}}],
Expand Down
20 changes: 10 additions & 10 deletions resources/puppetlabs/lein-ezbake/template/global/ext/debian/ezbake.service.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,9 @@ UMask=027
LimitNOFILE=<%= EZBake::Config[:open_file_limit] %>
<% end -%>

<% unless EZBake::Config[:debian][:pre_start_action].empty? -%>
PermissionsStartOnly=true
Copy link
Contributor Author

@bastelfreak bastelfreak Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would run the ExecStartPre command as root and could result into permission errors, so I removed it

<% EZBake::Config[:debian][:pre_start_action].each do |action| -%>
Copy link
Contributor Author

@bastelfreak bastelfreak Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't use those hooks for openvox-server/db, so I removed them to make the whole template more readable.

ExecStartPre=<%= action %>
<% end -%>
<% end -%>

# RUNTIME_DIRECTORY is set by systemd
# https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#RuntimeDirectory=
ExecStartPre=sh -c "echo -n 0 > ${RUNTIME_DIRECTORY}/restart"
ExecStart=<%= EZBake::Config[:java_bin] %> $JAVA_ARGS -Dlogappender=F1 \
'-XX:OnOutOfMemoryError=kill -9 %p' -XX:+CrashOnOutOfMemoryError \
-XX:ErrorFile="${LOGS_DIRECTORY}/<%= EZBake::Config[:real_name] %>_err_pid%p.log" \
Expand All @@ -59,14 +55,18 @@ ExecStart=<%= EZBake::Config[:java_bin] %> $JAVA_ARGS -Dlogappender=F1 \
-m <%= EZBake::Config[:main_namespace] %> \
--config "${CONFIG}" \
--bootstrap-config "${BOOTSTRAP_CONFIG}" \
--restart-file ${RUNTIME_DIRECTORY}/restart \
$TK_ARGS

KillMode=process

<% EZBake::Config[:debian][:post_start_action].each do |action| -%>
ExecStartPost=-<%= action %>
<% end -%>
# wait until the service is actually up
ExecStartPost=sh -c "sleep 1; while ! head -c1 ${RUNTIME_DIRECTORY}/restart | grep -q '^1'; do kill -0 $MAINPID && sleep 1 || exit 1; done"

ExecReload=sh -c "echo -n 0 > ${RUNTIME_DIRECTORY}/restart"
ExecReload=kill -HUP $MAINPID
ExecReload=sh -c "while ! head -c1 ${RUNTIME_DIRECTORY}/restart | grep -q '^1'; do kill -0 $MAINPID && sleep 1 || exit 1; done"
Copy link
Contributor

@austb austb Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was omitting an initial sleep here intentional? I don't think it matters too much because checking the file contents is a cheap operation and then it will sleep anyways, the difference just caught my eye.


SuccessExitStatus=143

[Install]
Expand Down
20 changes: 10 additions & 10 deletions resources/puppetlabs/lein-ezbake/template/global/ext/redhat/ezbake.service.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,9 @@ UMask=027
LimitNOFILE=<%= EZBake::Config[:open_file_limit] %>
<% end -%>

<% unless EZBake::Config[:redhat][:pre_start_action].empty? -%>
PermissionsStartOnly=true
<% EZBake::Config[:redhat][:pre_start_action].each do |action| -%>
ExecStartPre=<%= action %>
<% end -%>
<% end -%>

# RUNTIME_DIRECTORY is set by systemd
# https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#RuntimeDirectory=
ExecStartPre=sh -c "echo -n 0 > ${RUNTIME_DIRECTORY}/restart"
ExecStart=<%= EZBake::Config[:java_bin] %> $JAVA_ARGS -Dlogappender=F1 \
'-XX:OnOutOfMemoryError=kill -9 %p' -XX:+CrashOnOutOfMemoryError \
-XX:ErrorFile="${LOGS_DIRECTORY}/<%= EZBake::Config[:real_name] %>_err_pid%p.log" \
Expand All @@ -59,14 +55,18 @@ ExecStart=<%= EZBake::Config[:java_bin] %> $JAVA_ARGS -Dlogappender=F1 \
-m <%= EZBake::Config[:main_namespace] %> \
--config "${CONFIG}" \
--bootstrap-config "${BOOTSTRAP_CONFIG}" \
--restart-file ${RUNTIME_DIRECTORY}/restart \
$TK_ARGS

KillMode=process

<% EZBake::Config[:redhat][:post_start_action].each do |action| -%>
ExecStartPost=-<%= action %>
<% end -%>
# wait until the service is actually up
ExecStartPost=sh -c "sleep 1; while ! head -c1 ${RUNTIME_DIRECTORY}/restart | grep -q '^1'; do kill -0 $MAINPID && sleep 1 || exit 1; done"

ExecReload=sh -c "echo -n 0 > ${RUNTIME_DIRECTORY}/restart"
ExecReload=kill -HUP $MAINPID
ExecReload=sh -c "while ! head -c1 ${RUNTIME_DIRECTORY}/restart | grep -q '^1'; do kill -0 $MAINPID && sleep 1 || exit 1; done"
Copy link
Contributor

@austb austb Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above, just marking this in case any changes are made.


SuccessExitStatus=143

[Install]
Expand Down
4 changes: 0 additions & 4 deletions src/puppetlabs/ezbake/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,8 +624,6 @@ Additional uberjar dependencies:
:debian-postinst (val->ruby :debian :postinst)
:debian-postinst-install (val->ruby :debian :postinst-install)
:debian-install (val->ruby :debian :install)
:debian-pre-start-action (val->ruby :debian :pre-start-action)
:debian-post-start-action (val->ruby :debian :post-start-action)
:debian-activated-triggers (local->ruby :debian-activated-triggers [])
:debian-interested-install-triggers (map extract-deb-package-scripts
(get-local :debian-interested-install-triggers []))
Expand All @@ -637,8 +635,6 @@ Additional uberjar dependencies:
:redhat-postinst (val->ruby :redhat :postinst)
:redhat-postinst-install (val->ruby :redhat :postinst-install)
:redhat-install (val->ruby :redhat :install)
:redhat-pre-start-action (val->ruby :redhat :pre-start-action)
:redhat-post-start-action (val->ruby :redhat :post-start-action)
:terminus-map termini
:replaces-pkgs (for [{:keys [package version]}
(get-local :replaces-pkgs [])]
Expand Down
4 changes: 0 additions & 4 deletions test/unit/puppetlabs/ezbake/core_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
:cli-app-files "[]"
:debian-deps "[]"
:redhat-deps "[]"
:redhat-post-start-action "[]"
:tk-args "''"
:replaces-pkgs []
:start-before "[]"
Expand All @@ -75,12 +74,9 @@
:cli-defaults-file "'ext/cli_defaults/cli-defaults.sh'"
:debian-install "[]"
:redhat-postinst-install-triggers []
:redhat-pre-start-action "[]"
:user "'dummy'"
:redhat-install "[]"
:redhat-postinst-install "[]"
:debian-post-start-action "[]"
:debian-pre-start-action "[]"
:debian-preinst "[]"
:real-name "'dummy'"
:puppet-platform-version "7"
Expand Down