From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] squid init v_final Date: Wed, 18 May 2016 19:15:46 +0100 Message-ID: <1463595346.19435.15.camel@ipfire.org> In-Reply-To: <1463513604-30805-1-git-send-email-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1062428116861318564==" List-Id: --===============1062428116861318564== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, thanks. I finally merged this with a few changes: http://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dcommitdiff;h=3D6113575d812015= 91b2e8a76520579a4e7b7c5d46 and added some more changes: http://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dcommitdiff;h=3D691b2836c0ffa5= 4b3f7fc8d6f3b98377b3c9a470 http://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dcommitdiff;h=3D3fcc9b67fc7ab1= 886244a647dd7cf98f00e5c555 I used boot_mesg instead of echo in some situations. Refrased the warning message. Removed -r from rm. And finally if squid shut down gracefully the sh= ut down time is logged to syslog instead of being written to the console. I also added some more comments to the script so that we know what is going on in a few months down from here. This is working fine for me. Even with a small and almost empty cache squid takes about 14 seconds to shut down on my IPFire Prime Box. Please test everything again. I am going to deploy this on a few more test systems this week. Best, -Michael On Tue, 2016-05-17 at 21:33 +0200, Matthias Fischer wrote: > Last update suggestions for (3.5.xx) initscript, awaiting feedback. ;-) >=20 > Changelog: >=20 > - Raised 'while'-loop-time for stopping squid to 360 seconds until > =C2=A0 '/var/log/cache/swap.state' is deleted. NOT the whole cache structur= e! > =C2=A0 I know, this timeout could not be enough for really BIG caches. > =C2=A0 The only other choice I know would be to leave this loop alone witho= ut > =C2=A0 the "xxx seconds"-counter and wait how 'squid -k shutdown' handles t= his. > =C2=A0 But if it fails, I fear that we could end up in an endless loop. > =C2=A0 Suggestions are welcome! >=20 > - Had to delete 'wait' after killing squidguard, updxlrator, squidclamav > =C2=A0 and redirect_wrappers - 'while'-loop counter wouldn't work because of > =C2=A0 this line. > =C2=A0 Suggestions for better handling? >=20 > - Process detection looks for leftover '(squid-1)'-process using 'pgrep'. >=20 > - Cosmetic changes to some 'boot_mesg' lines. Added a few. Is it > =C2=A0 (still) too much? I'd prefer to get a warning (an announcement) if > =C2=A0 '/var/log/cache/swap.state' was deleted. >=20 > - Changed the 'flush'-command to really delete the entire > =C2=A0 '/var/log/cache'-structure, it will automatically be rebuild > =C2=A0 during the next start. > =C2=A0 Reason: a CLEAR cache command should really CLEAR the cache! >=20 > Best, > Matthias >=20 > Signed-off-by: Matthias Fischer > --- > =C2=A0src/initscripts/init.d/squid | 55 ++++++++++++++++++++++++++++-------= -------- > - > =C2=A01 file changed, 35 insertions(+), 20 deletions(-) >=20 > diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid > index abed90a..1b369ea 100644 > --- a/src/initscripts/init.d/squid > +++ b/src/initscripts/init.d/squid > @@ -94,9 +94,9 @@ case "$1" in > =C2=A0 stop) > =C2=A0 iptables -t nat -F SQUID > =C2=A0 if [ -e /var/run/squid.pid ]; then > - boot_mesg "Stopping Squid Proxy Server..." > - squid -k shutdown >/dev/null 2>&1 > - evaluate_retval > + boot_mesg -n "Stopping Squid Proxy Server...\n" > + boot_mesg "(this may take up to a few minutes)" > + /usr/sbin/squid -k shutdown >/dev/null 2>&1 > =C2=A0 > =C2=A0 # Stop squidGuard, updxlrator, squidclamav > =C2=A0 # and redirect_wrappers. > @@ -105,25 +105,41 @@ case "$1" in > =C2=A0 killproc /usr/bin/squidclamav >/dev/null & > =C2=A0 killproc /usr/sbin/redirect_wrapper >/dev/null & > =C2=A0 > - # Wait until all redirectors have been stopped. > - wait > - > - # If squid is still running, wait up to 30 seconds > - # before we go on to kill it. > - counter=3D30 > - > - while [ ${counter} -gt 0 ]; do > - statusproc /usr/sbin/squid >/dev/null && > break; > - sleep 1 > - counter=3D$(( ${counter} - 1)) > + # If some squid processes are still running, wait up > to 360 seconds > + # before we go on to kill the remaining process(es) > and delete damaged > + # '/var/log/cache/swap.state'. > + n=3D0 > + while squid -k check > /dev/null 2>&1 && [ $n -lt 360 > ]; do > + sleep 2 > + n=3D$(( ${n} + 2 )) > + echo -n . > =C2=A0 done > - > - # Kill squid service, if still running. > - killproc /usr/sbin/squid >/dev/null > + echo "" > + echo "Done." > + echo "Shutdown time:" "$n" "seconds" > + > + # If (squid-1) is still running after 360 seconds, > + # kill all squid processes and delete > '/var/log/cache/swap.state'. > + if ( pgrep -fl "(squid-1)" > /dev/null 2>&1 ); then > + killproc /usr/sbin/squid >/dev/null > + rm -rf /var/log/cache/swap.state > + echo "" > + boot_mesg -n "You should not be reading this > warning.\n" > + boot_mesg -n "Some squid-processes had to be > killed after 360 seconds,\n" > + boot_mesg -n "so the cache index file was > damaged and had to be deleted.\n" > + boot_mesg -n "This file will be rebuild > during the next start." > + echo_warning > + echo "" > + else > + boot_mesg "All squid processes exited > normally." > + echo_ok > + echo "" > + fi > + fi > =C2=A0 > =C2=A0 # Trash remain pid file from squid. > =C2=A0 rm -rf /var/run/squid.pid > - fi > + > =C2=A0 ;; > =C2=A0 > =C2=A0 restart) > @@ -143,8 +159,7 @@ case "$1" in > =C2=A0 > =C2=A0 flush) > =C2=A0 $0 stop > - echo > /var/log/cache/swap.state > - chown squid.squid /var/log/cache/swap.state > + rm -rf /var/log/cache/* > =C2=A0 sleep 1 > =C2=A0 $0 start > =C2=A0 ;; --===============1062428116861318564== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlhQTEZUQUFvSkVJQjU4UDl2a0FrSExCa1FBTE1DVEdrTEprOWJWWVd3WEZCWnNQb3YK clNHT0FUdk5qNG5Cb3ZRY1dTT0gzZ2FHeFh0dytzYVhqaDlXZ0w2NjcxR2pXUDh4bVE1RjI0VUt3 M2hCSjJvZgpEVEZIYjIwcmw4dXB0R3hXeUNPY2F0eWw3YTU2em9nV3ZRcjJTeHJXazNZWFNNY0Zy U1RCZ0NGSFpxaTZ4bWlWCittSFo2bnhlUFRxU1J0T3VobW53SzlrL0JRUUdSeXlOYXJjekRkUDZN OHU2ai9RY3lGVmZ1RDJpelZySU9pSVcKUGswTndXSFRyNDVrTkQ5US9lSzdzV3J6VFFDOWNGTzFk WnpPZkhKSGV5T05qUnVjRjR1TEhjZ2JHd1psYVgyRApUbGhseS9YYjd0Y2phaFpQNDNSalIyN1Fk TlA1VFhhaXpOU0xzbXZOWWYyYmNLcnFkVkFUblZBVlZPM2VWR1ZzCnJ4MUNlY3BwZ3VOOEU5NkVW Z2RUSGNrUjM5YWpKY010QkhSbVNjektQNzRxdE9XeDBHcndzNE12ZVJYWDRVTGQKN2VhTTRETUhV ZjZMTEMxM3UrR2QzWkxZSDVQbXovQVozVjBGcGdCRUdIa05wVVloWXE5ZlErVlUxRHZ0N1dxOQpo TUdtQTBWM3JRRFdwaVF5c0JGb2NvUGdOcDE3T2pVbXBDSjlhQ1huYUJCRkRNWkh0Q3RlV3hjOHNS dWxUeDZUCnRFTnBIRkNxb0Y4M3hMYTJuL25iRlAwMENwQmRQWklna2lVSjhTM0FYNk9QN21qdGhI RTc0b1krb2NBSi9KQW0KcE5iQ1NqQk84NUkyNXFqb2g2S0pGT1VBNm8zbG9rZWYra2x0MTVFT2tk OU9OcGRQNXk2aHN5dUtvbm0vcUtxLwpoUXM2aklnaU9pVHhQTWYyY0k3Zwo9Wm1GZQotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============1062428116861318564==--