From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: Re: [PATCH] apache: Fixes bug13656 - Add delay between stop & start of restart command. Date: Fri, 26 Apr 2024 17:08:05 +0200 Message-ID: <0c39bf74-cb2b-4591-825b-a525a87f125b@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0514013446833102861==" List-Id: --===============0514013446833102861== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Michael, On 26/04/2024 16:45, Michael Tremer wrote: > Hello Adolf, >=20 > I don=E2=80=99t think that we should need this loop. I believe that /usr/sb= in/apachectl -k stop should only return once the service has properly been te= rminated. Is that an incorrect assumption? Yes, I am afraid it is. See my feedback in bug13657 from yesterday. I ran some tests with the new Apache script and if you have a lot of IPFire c= apabilities enabled then I found that in one test after running the stop comm= and and getting an OK the start command found a pid was already present so it= didn't start Apache. However that pid was the old one (I recorded the pid be= fore I ran the CU185 update), which was still hanging around when the start c= ommand was initiated. After not starting Apache because the old pid was still= present that pid then disappeared as its removal finally occurred but then A= pache was not running so the WUI froze. In the second test Apache gave the message "Address already in use" when the = start command was initiated and so again Apache was not started after the sto= p. The only time I had the stop followed by start work was if I had an IPFire in= stall with no other capabilities enabled such as Web Proxy, OpenVPN, IPS. The= n the update from CU184 to CU185 went smoothly without any freezing of the WU= I and the Stop command was completed when the Start command started but not w= hen other IPFire capabilities were enabled. Regards, Adolf. >=20 > -Michael >=20 >> On 24 Apr 2024, at 17:56, Adolf Belka wrote: >> >> - The change of the apache initscript in CU181 made the restart comand a s= top followed by a >> start. From bug13656 it looks like when the start is run the pid file m= ay not yet be >> fully removed and so apache is not started, although the pid is being r= emoved. >> - This patch checks if the pid file is still present every second up to 10= seconds. Once the >> pid file is gone then the stop command is completed and the initscript = moves to the start >> command. >> - Rather than apply a fixed delay of 2 or 3 or 4 seconds I used a while lo= op to check every >> second if the file is still present. If at the end of 10 seconds it is = still present >> then something went wrong with the pid removal. >> - I have tested this patch on my vm system and it worked but it would be g= ood to be >> reviewed to make sure that it is a reasonable approach that has been us= ed and if required >> changed in whatever way makes the best sense. >> >> Fixes: Bug13656 >> Tested-by: Adolf Belka >> Signed-off-by: Adolf Belka >> --- >> src/initscripts/system/apache | 12 +++++++++++- >> 1 file changed, 11 insertions(+), 1 deletion(-) >> >> diff --git a/src/initscripts/system/apache b/src/initscripts/system/apache >> index 18eb86e2f..087e4084e 100644 >> --- a/src/initscripts/system/apache >> +++ b/src/initscripts/system/apache >> @@ -2,7 +2,7 @@ >> ##########################################################################= ##### >> # = # >> # IPFire.org - A linux based firewall = # >> -# Copyright (C) 2007-2022 IPFire Team = # >> +# Copyright (C) 2007-2024 IPFire Team = # >> # = # >> # This program is free software: you can redistribute it and/or modify = # >> # it under the terms of the GNU General Public License as published by = # >> @@ -87,6 +87,16 @@ case "$1" in >> stop) >> boot_mesg "Stopping Apache daemon..." >> /usr/sbin/apachectl -k stop >> + COUNTER=3D0 >> + while [ -e /var/run/httpd.pid ] >> + do >> + sleep 1 >> + (( COUNTER++ )) >> + if [ $COUNTER -eq 10 ]; then >> + boot_mesg "pid not removed after 10 seconds" >> + break >> + fi >> + done >> evaluate_retval >> ;; >> >> --=20 >> 2.44.0 >> >=20 --===============0514013446833102861==--