Skip to content
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

mariadb: Increase timeout for MariaDB shutdown #3570

Merged
merged 2 commits into from
Apr 18, 2024
Merged

mariadb: Increase timeout for MariaDB shutdown #3570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd1763b
mariadb: Increase timeout for MariaDB shutdown
agners Apr 17, 2024
54a4f5e
Increase shutdown timeout to 5 minutes
agners Apr 17, 2024
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
8 changes: 8 additions & 0 deletions mariadb/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 2.7.1

**Note:** Restart the add-on before upgrade if the current version is lower
than 2.7.0! This is to ensure a clean stop right before the update (see also
https://github.com/home-assistant/addons/issues/3566).

- Increase MariaDB add-on shutdown timeout to 300s

## 2.7.0

- Update to Alpine 3.19
Expand Down
3 changes: 1 addition & 2 deletions mariadb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ RUN apk add --no-cache \
pwgen

ENV \
LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" \
S6_SERVICES_GRACETIME=18000
LD_PRELOAD="/usr/local/lib/libjemalloc.so.2"

# Copy data
COPY rootfs /
Expand Down
4 changes: 2 additions & 2 deletions mariadb/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
version: 2.7.0
version: 2.7.1
slug: mariadb
name: MariaDB
description: A SQL database server
Expand Down Expand Up @@ -41,4 +41,4 @@ schema:
services:
- mysql:provide
startup: system
timeout: 20
timeout: 300
1 change: 1 addition & 0 deletions mariadb/rootfs/etc/s6-overlay/s6-rc.d/mariadb-core/timeout-kill
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
295000