From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] squid init v3: Update-suggestions for (3.5.xx)-initscript Date: Mon, 16 May 2016 16:13:56 +0100 Message-ID: <1463411636.18591.282.camel@ipfire.org> In-Reply-To: <1463330593-2110-1-git-send-email-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6955401813874046592==" List-Id: --===============6955401813874046592== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, there are a ton of patches now on this list and I have really no idea where I should start commenting on those. I will start with this one. But please try = to put everything into one patch(set) the next time and then wait for feedback. There should not be too many drafts here because it gets messy and I do not k= now what I actually reviewed already. On Sun, 2016-05-15 at 18:43 +0200, Matthias Fischer wrote: > These changes are mainly meant for upcoming squid 3.5.xx, > but should still work with 3.4.xx: >=20 > - Raised 'while-loop'-time for stopping squid to 360 seconds, > =C2=A0 even bigger caches should get a chance. ;-) Same question. Why 360 seconds? That is as arbitrary as the former timeout. > - Changed the 'while-loop' from using 'statusproc' to 'squid -k check', > =C2=A0 since 'statusproc' didn't find the still running '(squid-1)'-process. > =C2=A0 Thus, 'squid' hadn't enough time to close the index. This led to a > =C2=A0 damaged 'swap.state'-file and "Rebuilding storage in /var/log/cache" > =C2=A0 always ended with "(dirty log)". >=20 > - Process detection for leftover '(squid-1)'-process uses 'pgrep'. >=20 > - Cosmetic changes to some 'boot_mesg' lines. Added a few. >=20 > - Changed the 'flush'-command to delete the entire '/var/log/cache'-structu= re, > =C2=A0 it will automatically be rebuild during the next start. >=20 > Best, > Matthias >=20 > Signed-off-by: Matthias Fischer > --- > =C2=A0src/initscripts/init.d/squid | 43 ++++++++++++++++++++++++++++-------= -------- > =C2=A01 file changed, 28 insertions(+), 15 deletions(-) >=20 > diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid > index abed90a..47bf182 100644 > --- a/src/initscripts/init.d/squid > +++ b/src/initscripts/init.d/squid > @@ -94,8 +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 > + boot_mesg -n "Shutting down 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 evaluate_retval > =C2=A0 Why is the comment changed to "Shutting down..."? All the other processes show "Stopping..." as it was before. > =C2=A0 # Stop squidGuard, updxlrator, squidclamav > @@ -108,22 +109,35 @@ case "$1" in > =C2=A0 # Wait until all redirectors have been stopped. > =C2=A0 wait > =C2=A0 > - # 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; > + # If some squid processes are still running, wait up > to 360 seconds > + # before we go on to kill all and delete entire cache > structure. > + n=3D0 > + while [ /usr/sbin/squid -k check > /dev/null 2>&1 ] > && [ $n -lt 360 ]; do > =C2=A0 sleep 1 > - counter=3D$(( ${counter} - 1)) > + n=3D$(( ${n} + 1 )) > =C2=A0 done There is no square brackets needed for executing "squid -k check". Again, ple= ase do not use absolute path names. > =C2=A0 > - # Kill squid service, if still running. > - killproc /usr/sbin/squid >/dev/null > + # If (squid-1) is still running after 360 seconds, > + # kill all squid processes and delete damaged cache > structure. > + if ( pgrep -fl "(squid-1)" > /dev/null 2>&1 ); then > + killproc /usr/sbin/squid >/dev/null > + rm -rf /var/log/cache/* > + 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 index file and cache > contents had to be deleted.\n" > + boot_mesg -n "Therefore, the complete cache > structure will be rebuild\n" > + boot_mesg "during next start." > + echo_warning > + else > + boot_mesg "All squid processes exited > normally." > + echo_ok > + boot_mesg "" > + fi > + fi I do not see why it is suddenly necessary to completely destroy the cache. As far as I know the index was broken, but not the actual data. Why was this changed? > =C2=A0 > - # Trash remain pid file from squid. > + # Delete remaining pid file from squid if it still > exists. > =C2=A0 rm -rf /var/run/squid.pid > - fi > + > =C2=A0 ;; > =C2=A0 > =C2=A0 restart) > @@ -143,8 +157,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 ;; -Michael --===============6955401813874046592== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlhPZU8wQUFvSkVJQjU4UDl2a0FrSEhGQVAvMGpFcjJxdFhJT3ZIU3NUNHl0b2l2LzQK M2RMUUVmOTJoTExxeFRNVGNmL0c4SWRrUkQvbndkN1dlZnpnbkpNWkNWWU84NmxqN3BXamphQk55 dzMxNDdSQwpleFQ4MDJQckpwaGRObWx6MUllWVpXcjVxVndUVTV6RE9lbUhQZW43clNJdTNvcXB1 MWNvRjU4a3J6eWhncWdiCnNTaHhGRlVGTjJvWlMrRldVYWxDMXJNa1FiUmNQN1hKaUR5aXVMamg2 cEsvUTdSUVNudThmNm1TdloweEtMOG0KdngvTkxhWTh4ZXhrTlQweVNDTGtZeE9Sd3JVZlNuSW9a OVFvRjNoYWJzTEFmcEtuSXVWRjEvWi93MjBvNUc0bgpUZlQ1YWhKbnhBanBKMjNxbE82d2pzVGkx SG1pZzZMT3VtZmMzY1FhQWU0YWxFYTFuenNrbVd0TlNwVzdEWGxzClg0amJ3Wk5ZVXI5enA5dmtJ Qm1xYXY5TWlVQTJTSXlONU5BV2FvUTZ1TTNkRHhuSFVBTTk4MUVSbTQxS1Ric04KN1FxR2FURytn N0d5YjcwMmcxUEhqazloWURtd01EVEJqYmR4M2FmZmg2a3VmeEgzd1RDWWlmeEZMdjJodHlLYwpF QlFHa0xOTHA5Q2tLKzZKMGpBY2pKRjJzTkZoNkVlUElydHp0c2FGTlp5WlpIbTIxZ2x3V1lpcjBE ZWZLS1YxCkhmQUJvR0xQZWZLbTJWb040dmk4S1BMNmF2dFFzc08yMnREcm1XenN2cWdMWlNEMnpL WWdVaTFmR1VBY3lDczUKbU8vZXp4dG01bUc4QVZQM21GMGpnRXE2Zk5PaWZNaXgxUGlzRVVPeVo2 V1N1SWdna3hFTUM0VWJxTzIrTExqWAprU2hkWU8yVzgvRHZXSVFJZTE3MAo9eVV5cwotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============6955401813874046592==--