From 78f47dea4f27ccb96f23a1437fa7e41fb0afef17 Mon Sep 17 00:00:00 2001 From: sunguoshuai Date: Thu, 2 Sep 2021 16:02:10 +0800 Subject: [PATCH] Fix tidb-server.service start failure (cherry picked from commit d020f5dc74ea949c24f9a25ed7a2731f021e9f71) --- tidb-server.service | 4 ++-- tidb.spec | 24 ++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/tidb-server.service b/tidb-server.service index e6773fa..7e82a98 100644 --- a/tidb-server.service +++ b/tidb-server.service @@ -7,8 +7,8 @@ Wants=network-online.target User=mysql Group=mysql EnvironmentFile=-/etc/sysconfig/tidb-server -ExecStart=/usr/bin/tidb-server \$OPTIONS -ExecReload=/bin/kill -HUP \$MAINPID +ExecStart=/usr/bin/tidb-server $OPTIONS +ExecReload=/bin/kill -HUP $MAINPID KillSignal=SIGINT Restart=on-failure LimitNOFILE=65536 diff --git a/tidb.spec b/tidb.spec index 4dd8799..4df804b 100644 --- a/tidb.spec +++ b/tidb.spec @@ -1,6 +1,6 @@ Name: tidb Version: 4.0.14 -Release: 1 +Release: 2 Summary: TiDB is a distributed NewSQL database compatible with MySQL protocol License: QL and STRUTIL @@ -40,6 +40,23 @@ cp %{SOURCE2} %{buildroot}%{_sysconfdir}/tidb mkdir -p %{buildroot}%{_unitdir} cp %{SOURCE1} %{buildroot}%{_unitdir} +%pre +# Add the "mysql" user +getent group mysql >/dev/null || groupadd -r -g 27 mysql +getent passwd mysql >/dev/null || useradd -r -u 27 -g 27 -s /sbin/nologin -d /var/lib/mysql mysql +exit 0 + +%post +%systemd_post tidb-server.service +/usr/bin/mkdir -p /var/lib/mysql +/usr/bin/chown -R mysql:mysql /var/lib/mysql + +%preun +%systemd_preun tidb-server.service + +%postun +%systemd_postun_with_restart tidb-server.service + %files %{_bindir}/tidb-server %{_unitdir}/tidb-server.service @@ -51,5 +68,8 @@ cp %{SOURCE1} %{buildroot}%{_unitdir} %license LICENSE %changelog -* Fri Aug 20 2021 huanghaitao +* Thu Sep 02 2021 sunguoshuai - 4.0.14-2 +- Fix tidb-server.service start failure + +* Fri Aug 20 2021 huanghaitao - 4.0.14-1 - Package init -- Gitee