From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernhard Bitsch To: development@lists.ipfire.org Subject: Re: [PATCH] pakfire.cgi: Implement logic to lock the page until pakfire has been fully launched. Date: Wed, 10 Nov 2021 13:54:41 +0100 Message-ID: In-Reply-To: <4A60896C-338B-4B88-92E3-B46C9BF93748@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0279033742616961796==" List-Id: --===============0279033742616961796== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, I can confirm this. Knowing about the issue allows to answer questions=20 concerning it in the community. -Bernhard Am 10.11.2021 um 09:56 schrieb Michael Tremer: > Hello, >=20 > I had a brief phone call with Stefan yesterday where he said that he was go= ing to have a look at this again. >=20 > In the meantime he said that the patch can be shipped because it does not b= reak anything, although it doesn=E2=80=99t solve the problem it was meant to = solve either. >=20 > Can everybody confirm this? >=20 > -Michael >=20 >> On 5 Nov 2021, at 19:10, Jon Murphy wrote: >> >> In Core Update 161 (testing): Same issue. I see the spin and Pakfire is = working . . . but no messages. >> >> IPFire 2.27 (x86_64) - Core Update 161 Development Build: master/191347cc >> >> Jon >> >> >>> On Oct 21, 2021, at 5:17 AM, Bernhard Bitsch wrote: >>> >>> Reviewed-by: Bernhard Bitsch >>> >>> The locking is functioning. >>> But the excerpt of /var/log/messages isn't displayed. >>> >>> Am 18.10.2021 um 21:09 schrieb Stefan Schantl: >>>> When performing any action which requires pakfire, the page gets locked >>>> with an message informing the user that pakfire is working. The page >>>> will be reloaded when pakfire has been launched and is doing the >>>> requested operation - showing the well known log output. This also >>>> happens when pakfire has been launched via any kind of terminal or SSH >>>> session and the CGI gets accessed. >>>> Internally before pakfire gets started a variable called page_lock will >>>> be set to lock the page. An while loop will keep the page locked until >>>> pakfire is launched fully and has written it's lock_file. >>>> This approach will prevent us from any kind of required time intervall >>>> or race conditions. >>>> Signed-off-by: Stefan Schantl >>>> --- >>>> html/cgi-bin/pakfire.cgi | 49 ++++++++++++++++++++++++++++++++++++++-- >>>> 1 file changed, 47 insertions(+), 2 deletions(-) >>>> diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi >>>> index 0cf522ba1..f2381f031 100644 >>>> --- a/html/cgi-bin/pakfire.cgi >>>> +++ b/html/cgi-bin/pakfire.cgi >>>> @@ -44,6 +44,8 @@ $cgiparams{'VALID'} =3D ''; >>>> $cgiparams{'INSPAKS'} =3D ''; >>>> $cgiparams{'DELPAKS'} =3D ''; >>>> +my $page_lock; >>>> + >>>> sub refreshpage{&Header::openbox( 'Waiting', 1, "" );print "
=3D''
$Lang::tr{'pagerefresh'}
";&H= eader::closebox();} >>>> &Header::getcgihash(\%cgiparams); >>>> @@ -57,8 +59,9 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, ">>> if (($cgiparams{'ACTION'} eq 'install') && (! -e $Pakfire::lockfile)) { >>>> my @pkgs =3D split(/\|/, $cgiparams{'INSPAKS'}); >>>> if ("$cgiparams{'FORCE'}" eq "on") { >>>> + # Lock the page. >>>> + $page_lock =3D "1"; >>>> &General::system_background("/usr/local/bin/pakfire", "install", "--= non-interactive", "--no-colors", @pkgs); >>>> - sleep(2); >>>> } else { >>>> &Header::openbox("100%", "center", $Lang::tr{'request'}); >>>> my @output =3D &General::system_output("/usr/local/bin/pakfire", "re= solvedeps", "--no-colors", @pkgs); >>>> @@ -95,8 +98,9 @@ END >>>> } elsif (($cgiparams{'ACTION'} eq 'remove') && (! -e $Pakfire::lockfil= e)) { >>>> my @pkgs =3D split(/\|/, $cgiparams{'DELPAKS'}); >>>> if ("$cgiparams{'FORCE'}" eq "on") { >>>> + # Lock the page. >>>> + $page_lock =3D "1"; >>>> &General::system_background("/usr/local/bin/pakfire", "remove", "--n= on-interactive", "--no-colors", @pkgs); >>>> - sleep(2); >>>> } else { >>>> &Header::openbox("100%", "center", $Lang::tr{'request'}); >>>> my @output =3D &General::system_output("/usr/local/bin/pakfire", "re= solvedeps", "--no-colors", @pkgs); >>>> @@ -132,8 +136,12 @@ END >>>> } >>>> } elsif (($cgiparams{'ACTION'} eq 'update') && (! -e $Pakfire::lockf= ile)) { >>>> + # Set variable to lock the page. >>>> + $page_lock =3D "1"; >>>> &General::system_background("/usr/local/bin/pakfire", "update", "--fo= rce", "--no-colors"); >>>> } elsif (($cgiparams{'ACTION'} eq 'upgrade') && (!-e $Pakfire::lockfil= e)) { >>>> + # Lock the page. >>>> + $page_lock =3D "1"; >>>> &General::system_background("/usr/local/bin/pakfire", "upgrade", "-y"= , "--no-colors"); >>>> } elsif ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") { >>>> $pakfiresettings{"TREE"} =3D $cgiparams{"TREE"}; >>>> @@ -169,6 +177,43 @@ if ($errormessage) { >>>> &Header::closebox(); >>>> } >>>> +# Check if a page lock is required. >>>> +if ($page_lock) { >>>> + &Header::openbox('Waiting', 1, ,); >>>> + print <>>> + >>>> + >>>> + >>>> + >>>> + >>>> + >>>> +
>>>> + 3D'$Lang::tr{'active'}' >>>> + >>>> + $Lang::tr{'pakfire working'} >>>> +
>>>> +END >>>> + &Header::closebox(); >>>> + >>>> + # Infinite loop to lock the page until pakfire lockfile is present. >>>> + while($page_lock) { >>>> + unless (-e $Pakfire::lockfile) { >>>> + sleep(1); >>>> + } else { >>>> + # Release page lock. >>>> + undef($page_lock); >>>> + >>>> + # Break loop. >>>> + last; >>>> + } >>>> + } >>>> + >>>> + # Perform page reload. >>>> + print "\n"; >>>> + exit; >>>> +} >>>> + >>>> +# Check if pakfire is already running. In this case a lockfile is prese= nt. >>>> if (-e $Pakfire::lockfile) { >>>> &Header::openbox( 'Waiting', 1, "" ); >>>> print <> >=20 --===============0279033742616961796==--