From 1f468a38a8c3a4b72778311f60f4633f01507f4a Mon Sep 17 00:00:00 2001
From: lingsheng <lingsheng@huawei.com>
Date: Tue, 7 Dec 2021 10:21:26 +0800
Subject: [PATCH] fix obsnotifyforward service stop failure

---
 obs-server.spec                               |  6 +++-
 ...xiting-restarting-the-redis-services.patch | 36 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 ping-when-exiting-restarting-the-redis-services.patch

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