packages/obs-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!64 fix obsnotifyforward service stop failure

Browse Source 
From: @ultra_planet
Reviewed-by: @small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2021-12-07 02:56:27 +00:00 committed by Gitee
commit 425e0f6eb9
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
obs-server.spec
View File

@ -5,7 +5,7 @@
Name: obs-server Name: obs-server
Version: 2.10.1 Version: 2.10.1
Release: lp151.23.12 Release: lp151.23.13
Summary: The Open Build Service -- Server Component Summary: The Open Build Service -- Server Component
License: GPL-2.0-only or GPL-3.0-only License: GPL-2.0-only or GPL-3.0-only
URL: http://www.openbuildservice.org URL: http://www.openbuildservice.org
@ -21,6 +21,7 @@ Patch6: change-bundled-rubygem-bundler-version.patch
Patch7: fix-obs_productconvert-inputfile-path.patch Patch7: fix-obs_productconvert-inputfile-path.patch
Patch8: obs_project_update-should-tell-the-usage-but-not-hung-still.patch Patch8: obs_project_update-should-tell-the-usage-but-not-hung-still.patch
Patch9: Adapt-setup-appliance.sh-for-openeuler.patch Patch9: Adapt-setup-appliance.sh-for-openeuler.patch
Patch10: ping-when-exiting-restarting-the-redis-services.patch
BuildArch: noarch BuildArch: noarch
@ -492,6 +493,9 @@ usermod -a -G docker obsservicerun
%{_sbindir}/rcobsstoragesetup %{_sbindir}/rcobsstoragesetup
%changelog %changelog
* Mon Dec 06 2021 lingsheng <lingsheng@huawei.com> - 2.10.1-lp151.23.13
- fix obsnotifyforward service stop failure
* Wed Dec 01 2021 lingsheng <lingsheng@huawei.com> - 2.10.1-lp151.23.12 * Wed Dec 01 2021 lingsheng <lingsheng@huawei.com> - 2.10.1-lp151.23.12
- fix obsapisetup script problems, modify production.sphinx.conf owner - fix obsapisetup script problems, modify production.sphinx.conf owner

36
ping-when-exiting-restarting-the-redis-services.patch Normal file
View File

@ -0,0 +1,36 @@
From 31f9623ef70473539c9598ff4d2aca1fa0a0408f Mon Sep 17 00:00:00 2001
From: Michael Schroeder <mls@suse.de>
Date: Mon, 27 Apr 2020 17:36:07 +0200
Subject: [PATCH] [backend] ping when exiting/restarting the redis services
---
src/backend/bs_notifyforward | 2 +-
src/backend/bs_redis | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/backend/bs_notifyforward b/src/backend/bs_notifyforward
index 75e42a5c138..bb155777b03 100755
--- a/src/backend/bs_notifyforward
+++ b/src/backend/bs_notifyforward
@@ -248,7 +248,7 @@ BSUtil::drop_privs_to($BSConfig::bsuser, $BSConfig::bsgroup);
$| = 1;
$SIG{'PIPE'} = 'IGNORE';
-BSUtil::restartexit($options, 'notifyforward', "$rundir/bs_notifyforward");
+BSUtil::restartexit($options, 'notifyforward', "$rundir/bs_notifyforward", "$myeventdir/.ping");
BSUtil::printlog("starting build service notifyforward");
mkdir_p($rundir);
diff --git a/src/backend/bs_redis b/src/backend/bs_redis
index cbbd05880ce..acb8eed2835 100755
--- a/src/backend/bs_redis
+++ b/src/backend/bs_redis
@@ -224,7 +224,7 @@ BSUtil::drop_privs_to($BSConfig::bsuser, $BSConfig::bsgroup);
$| = 1;
$SIG{'PIPE'} = 'IGNORE';
-BSUtil::restartexit($options, 'redis', "$rundir/bs_redis");
+BSUtil::restartexit($options, 'redis', "$rundir/bs_redis", "$myeventdir/.ping");
BSUtil::printlog("starting build service redis forwarder");
mkdir_p($rundir);